Merge remote-tracking branch 'origin/MC-34674' into 2.4-develop-pr27

Author: serhii-balko

app/code/Magento/Vault/Model/Ui/Adminhtml/TokensConfigProvider.php

@@ -24,9 +24,10 @@
 use Magento\Vault\Model\VaultPaymentInterface;
 
 /**
- * Class ConfigProvider
+ * Provide tokens config
  * @api
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  *
  * @api
  * @since 100.1.0
@@ -113,6 +114,8 @@ public function __construct(
     }
 
     /**
+     * Get list of tokens components
+     *
      * @param string $vaultPaymentCode
      * @return TokenUiComponentInterface[]
      * @since 100.1.0
@@ -184,6 +187,13 @@ public function getTokensComponents($vaultPaymentCode)
                     ->create(),
                 ]
         );
+        $this->searchCriteriaBuilder->addFilters(
+            [
+                $this->filterBuilder->setField(PaymentTokenInterface::IS_VISIBLE)
+                    ->setValue(1)
+                    ->create(),
+            ]
+        );
 
         $searchCriteria = $this->searchCriteriaBuilder->create();
 
@@ -195,6 +205,8 @@ public function getTokensComponents($vaultPaymentCode)
     }
 
     /**
+     * Get component provider
+     *
      * @param string $vaultProviderCode
      * @return TokenUiComponentProviderInterface|null
      */
@@ -210,6 +222,7 @@ private function getComponentProvider($vaultProviderCode)
 
     /**
      * Get active vault payment by code
+     *
      * @param string $vaultPaymentCode
      * @return VaultPaymentInterface|null
      */
@@ -222,6 +235,7 @@ private function getVaultPayment($vaultPaymentCode)
 
     /**
      * Returns payment token entity id by order payment id
+     *
      * @return int|null
      */
     private function getPaymentTokenEntityId()
@@ -237,6 +251,7 @@ private function getPaymentTokenEntityId()
      * Returns order payment entity id
      * Using 'getReordered' for Reorder action
      * Using 'getOrder' for Edit action
+     *
      * @return int
      */
     private function getOrderPaymentEntityId()
@@ -250,6 +265,7 @@ private function getOrderPaymentEntityId()
 
     /**
      * Get payment data helper instance
+     *
      * @return Data
      * @deprecated 100.1.0
      */
@@ -263,6 +279,7 @@ private function getPaymentDataHelper()
 
     /**
      * Returns order repository instance
+     *
      * @return OrderRepositoryInterface
      * @deprecated 100.2.0
      */
@@ -278,6 +295,7 @@ private function getOrderRepository()
 
     /**
      * Returns payment token management instance
+     *
      * @return PaymentTokenManagementInterface
      * @deprecated 100.2.0
      */

app/code/Magento/Vault/Test/Unit/Model/Ui/Adminhtml/TokensConfigProviderTest.php

@@ -35,6 +35,8 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * Test for TokensConfigProvider
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TokensConfigProviderTest extends TestCase
@@ -578,19 +580,23 @@ private function getSearchCriteria($customerId, $entityId, $vaultProviderCode)
             '2015-01-01 00:00:00',
             3
         );
+
+        $isVisibleFilter = $this->createExpectedFilter(PaymentTokenInterface::IS_VISIBLE, 1, 4);
+
         $this->filterBuilder->expects(static::once())
             ->method('setConditionType')
             ->with('gt')
             ->willReturnSelf();
 
-        $this->searchCriteriaBuilder->expects(self::exactly(4))
+        $this->searchCriteriaBuilder->expects(self::exactly(5))
             ->method('addFilters')
             ->willReturnMap(
                 [
                     [$customerFilter, $this->searchCriteriaBuilder],
                     [$codeFilter, $this->searchCriteriaBuilder],
                     [$expiresAtFilter, $this->searchCriteriaBuilder],
                     [$isActiveFilter, $this->searchCriteriaBuilder],
+                    [$isVisibleFilter, $this->searchCriteriaBuilder],
                 ]
             );