+
downloadable/customer/products
My Downloadable Products
- 20
+ 217
diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
index ec099eb576425..8522700adbb6d 100644
--- a/app/code/Magento/Eav/Model/Config.php
+++ b/app/code/Magento/Eav/Model/Config.php
@@ -839,6 +839,7 @@ protected function _createAttribute($entityType, $attributeData)
}
/** @var AbstractAttribute $attribute */
$attribute = $this->createAttribute($model)->setData($attributeData);
+ $attribute->setOrigData('entity_type_id', $attribute->getEntityTypeId());
$this->_addAttributeReference(
$attributeData['attribute_id'],
$code,
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php
index e4a0e935b325d..83fb1253aba96 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php
@@ -223,11 +223,13 @@ public function testGetAttributes($cacheEnabled)
->method('getData')
->willReturn([$attributeData]);
$entityAttributeMock = $this->getMockBuilder(Attribute::class)
- ->setMethods(['setData', 'load', 'toArray'])
+ ->setMethods(['setData', 'setOrigData', 'load', 'toArray'])
->disableOriginalConstructor()
->getMock();
$entityAttributeMock->method('setData')
->willReturnSelf();
+ $entityAttributeMock->method('setOrigData')
+ ->willReturn($attributeData);
$entityAttributeMock->method('load')
->willReturnSelf();
$entityAttributeMock->method('toArray')
diff --git a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
index 1ea2b6958734c..2560d7e26e7d9 100644
--- a/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php
@@ -166,6 +166,23 @@ public function createIndex($index, $settings)
);
}
+ /**
+ * Add/update an Elasticsearch index settings.
+ *
+ * @param string $index
+ * @param array $settings
+ * @return void
+ */
+ public function putIndexSettings(string $index, array $settings): void
+ {
+ $this->getClient()->indices()->putSettings(
+ [
+ 'index' => $index,
+ 'body' => $settings,
+ ]
+ );
+ }
+
/**
* Delete an Elasticsearch index.
*
@@ -348,6 +365,17 @@ private function prepareFieldInfo($fieldInfo)
return $fieldInfo;
}
+ /**
+ * Get mapping from Elasticsearch index.
+ *
+ * @param array $params
+ * @return array
+ */
+ public function getMapping(array $params): array
+ {
+ return $this->getClient()->indices()->getMapping($params);
+ }
+
/**
* Delete mapping in Elasticsearch index
*
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
index 5ab6669a34cc4..25e691972d81d 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -6,6 +6,12 @@
namespace Magento\Elasticsearch\Model\Adapter;
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\ArrayManager;
+
/**
* Elasticsearch adapter
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -69,6 +75,31 @@ class Elasticsearch
*/
private $batchDocumentDataMapper;
+ /**
+ * @var array
+ */
+ private $mappedAttributes = [];
+
+ /**
+ * @var string[]
+ */
+ private $indexByCode = [];
+
+ /**
+ * @var ProductAttributeRepositoryInterface
+ */
+ private $productAttributeRepository;
+
+ /**
+ * @var StaticField
+ */
+ private $staticFieldProvider;
+
+ /**
+ * @var ArrayManager
+ */
+ private $arrayManager;
+
/**
* @param \Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager
* @param FieldMapperInterface $fieldMapper
@@ -78,7 +109,11 @@ class Elasticsearch
* @param Index\IndexNameResolver $indexNameResolver
* @param BatchDataMapperInterface $batchDocumentDataMapper
* @param array $options
+ * @param ProductAttributeRepositoryInterface|null $productAttributeRepository
+ * @param StaticField|null $staticFieldProvider
+ * @param ArrayManager|null $arrayManager
* @throws \Magento\Framework\Exception\LocalizedException
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Elasticsearch\SearchAdapter\ConnectionManager $connectionManager,
@@ -88,7 +123,10 @@ public function __construct(
\Psr\Log\LoggerInterface $logger,
\Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver $indexNameResolver,
BatchDataMapperInterface $batchDocumentDataMapper,
- $options = []
+ $options = [],
+ ProductAttributeRepositoryInterface $productAttributeRepository = null,
+ StaticField $staticFieldProvider = null,
+ ArrayManager $arrayManager = null
) {
$this->connectionManager = $connectionManager;
$this->fieldMapper = $fieldMapper;
@@ -97,6 +135,12 @@ public function __construct(
$this->logger = $logger;
$this->indexNameResolver = $indexNameResolver;
$this->batchDocumentDataMapper = $batchDocumentDataMapper;
+ $this->productAttributeRepository = $productAttributeRepository ?:
+ ObjectManager::getInstance()->get(ProductAttributeRepositoryInterface::class);
+ $this->staticFieldProvider = $staticFieldProvider ?:
+ ObjectManager::getInstance()->get(StaticField::class);
+ $this->arrayManager = $arrayManager ?:
+ ObjectManager::getInstance()->get(ArrayManager::class);
try {
$this->client = $this->connectionManager->getConnection($options);
@@ -322,6 +366,93 @@ public function updateAlias($storeId, $mappedIndexerId)
// remove obsolete index
if ($oldIndex) {
$this->client->deleteIndex($oldIndex);
+ unset($this->indexByCode[$mappedIndexerId . '_' . $storeId]);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Update Elasticsearch mapping for index.
+ *
+ * @param int $storeId
+ * @param string $mappedIndexerId
+ * @param string $attributeCode
+ * @return $this
+ */
+ public function updateIndexMapping(int $storeId, string $mappedIndexerId, string $attributeCode): self
+ {
+ $indexName = $this->getIndexFromAlias($storeId, $mappedIndexerId);
+ if (empty($indexName)) {
+ return $this;
+ }
+
+ $attribute = $this->productAttributeRepository->get($attributeCode);
+ $newAttributeMapping = $this->staticFieldProvider->getField($attribute);
+ $mappedAttributes = $this->getMappedAttributes($indexName);
+
+ $attrToUpdate = array_diff_key($newAttributeMapping, $mappedAttributes);
+ if (!empty($attrToUpdate)) {
+ $settings['index']['mapping']['total_fields']['limit'] = $this
+ ->getMappingTotalFieldsLimit(array_merge($mappedAttributes, $attrToUpdate));
+ $this->client->putIndexSettings($indexName, ['settings' => $settings]);
+
+ $this->client->addFieldsMapping(
+ $attrToUpdate,
+ $indexName,
+ $this->clientConfig->getEntityType()
+ );
+ $this->setMappedAttributes($indexName, $attrToUpdate);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Retrieve index definition from class.
+ *
+ * @param int $storeId
+ * @param string $mappedIndexerId
+ * @return string
+ */
+ private function getIndexFromAlias(int $storeId, string $mappedIndexerId): string
+ {
+ $indexCode = $mappedIndexerId . '_' . $storeId;
+ if (!isset($this->indexByCode[$indexCode])) {
+ $this->indexByCode[$indexCode] = $this->indexNameResolver->getIndexFromAlias($storeId, $mappedIndexerId);
+ }
+
+ return $this->indexByCode[$indexCode];
+ }
+
+ /**
+ * Retrieve mapped attributes from class.
+ *
+ * @param string $indexName
+ * @return array
+ */
+ private function getMappedAttributes(string $indexName): array
+ {
+ if (empty($this->mappedAttributes[$indexName])) {
+ $mappedAttributes = $this->client->getMapping(['index' => $indexName]);
+ $pathField = $this->arrayManager->findPath('properties', $mappedAttributes);
+ $this->mappedAttributes[$indexName] = $this->arrayManager->get($pathField, $mappedAttributes, []);
+ }
+
+ return $this->mappedAttributes[$indexName];
+ }
+
+ /**
+ * Set mapped attributes to class.
+ *
+ * @param string $indexName
+ * @param array $mappedAttributes
+ * @return $this
+ */
+ private function setMappedAttributes(string $indexName, array $mappedAttributes): self
+ {
+ foreach ($mappedAttributes as $attributeCode => $attributeParams) {
+ $this->mappedAttributes[$indexName][$attributeCode] = $attributeParams;
}
return $this;
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
index f7dfcd29e5036..bc031fc988fb0 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
@@ -7,8 +7,9 @@
namespace Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider;
-use Magento\Eav\Model\Config;
use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface
as IndexTypeConverterInterface;
@@ -109,67 +110,82 @@ public function getFields(array $context = []): array
$allAttributes = [];
foreach ($attributes as $attribute) {
- if (in_array($attribute->getAttributeCode(), $this->excludedAttributes, true)) {
- continue;
- }
- $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attribute->getAttributeCode());
- $fieldName = $this->fieldNameResolver->getFieldName($attributeAdapter);
+ $allAttributes += $this->getField($attribute);
+ }
- $allAttributes[$fieldName] = [
- 'type' => $this->fieldTypeResolver->getFieldType($attributeAdapter),
- ];
+ $allAttributes['store_id'] = [
+ 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
+ 'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE),
+ ];
- $index = $this->fieldIndexResolver->getFieldIndex($attributeAdapter);
- if (null !== $index) {
- $allAttributes[$fieldName]['index'] = $index;
- }
+ return $allAttributes;
+ }
- if ($attributeAdapter->isSortable()) {
- $sortFieldName = $this->fieldNameResolver->getFieldName(
- $attributeAdapter,
- ['type' => FieldMapperInterface::TYPE_SORT]
- );
- $allAttributes[$fieldName]['fields'][$sortFieldName] = [
- 'type' => $this->fieldTypeConverter->convert(
- FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
- ),
- 'index' => $this->indexTypeConverter->convert(
- IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
- )
- ];
- }
+ /**
+ * Get field mapping for specific attribute.
+ *
+ * @param AbstractAttribute $attribute
+ * @return array
+ */
+ public function getField(AbstractAttribute $attribute): array
+ {
+ $fieldMapping = [];
+ if (in_array($attribute->getAttributeCode(), $this->excludedAttributes, true)) {
+ return $fieldMapping;
+ }
+
+ $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attribute->getAttributeCode());
+ $fieldName = $this->fieldNameResolver->getFieldName($attributeAdapter);
- if ($attributeAdapter->isTextType()) {
- $keywordFieldName = FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD;
- $index = $this->indexTypeConverter->convert(
+ $fieldMapping[$fieldName] = [
+ 'type' => $this->fieldTypeResolver->getFieldType($attributeAdapter),
+ ];
+
+ $index = $this->fieldIndexResolver->getFieldIndex($attributeAdapter);
+ if (null !== $index) {
+ $fieldMapping[$fieldName]['index'] = $index;
+ }
+
+ if ($attributeAdapter->isSortable()) {
+ $sortFieldName = $this->fieldNameResolver->getFieldName(
+ $attributeAdapter,
+ ['type' => FieldMapperInterface::TYPE_SORT]
+ );
+ $fieldMapping[$fieldName]['fields'][$sortFieldName] = [
+ 'type' => $this->fieldTypeConverter->convert(
+ FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
+ ),
+ 'index' => $this->indexTypeConverter->convert(
IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
- );
- $allAttributes[$fieldName]['fields'][$keywordFieldName] = [
- 'type' => $this->fieldTypeConverter->convert(
- FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
- )
- ];
- if ($index) {
- $allAttributes[$fieldName]['fields'][$keywordFieldName]['index'] = $index;
- }
- }
+ )
+ ];
+ }
- if ($attributeAdapter->isComplexType()) {
- $childFieldName = $this->fieldNameResolver->getFieldName(
- $attributeAdapter,
- ['type' => FieldMapperInterface::TYPE_QUERY]
- );
- $allAttributes[$childFieldName] = [
- 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING)
- ];
+ if ($attributeAdapter->isTextType()) {
+ $keywordFieldName = FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD;
+ $index = $this->indexTypeConverter->convert(
+ IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
+ );
+ $fieldMapping[$fieldName]['fields'][$keywordFieldName] = [
+ 'type' => $this->fieldTypeConverter->convert(
+ FieldTypeConverterInterface::INTERNAL_DATA_TYPE_KEYWORD
+ )
+ ];
+ if ($index) {
+ $fieldMapping[$fieldName]['fields'][$keywordFieldName]['index'] = $index;
}
}
- $allAttributes['store_id'] = [
- 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING),
- 'index' => $this->indexTypeConverter->convert(IndexTypeConverterInterface::INTERNAL_NO_INDEX_VALUE),
- ];
+ if ($attributeAdapter->isComplexType()) {
+ $childFieldName = $this->fieldNameResolver->getFieldName(
+ $attributeAdapter,
+ ['type' => FieldMapperInterface::TYPE_QUERY]
+ );
+ $fieldMapping[$childFieldName] = [
+ 'type' => $this->fieldTypeConverter->convert(FieldTypeConverterInterface::INTERNAL_DATA_TYPE_STRING)
+ ];
+ }
- return $allAttributes;
+ return $fieldMapping;
}
}
diff --git a/app/code/Magento/Elasticsearch/Model/DataProvider/Base/Suggestions.php b/app/code/Magento/Elasticsearch/Model/DataProvider/Base/Suggestions.php
index 8364b6c116b7d..2d4f8abeb8ecd 100644
--- a/app/code/Magento/Elasticsearch/Model/DataProvider/Base/Suggestions.php
+++ b/app/code/Magento/Elasticsearch/Model/DataProvider/Base/Suggestions.php
@@ -5,19 +5,23 @@
*/
namespace Magento\Elasticsearch\Model\DataProvider\Base;
-use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Search\Model\QueryInterface;
+use Elasticsearch\Common\Exceptions\BadRequest400Exception;
use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
use Magento\Elasticsearch\Model\Config;
use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
-use Magento\Search\Model\QueryResultFactory;
-use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Search\Model\QueryInterface;
+use Magento\Search\Model\QueryResultFactory;
+use Magento\Store\Model\ScopeInterface;
use Magento\Store\Model\StoreManagerInterface as StoreManager;
+use Psr\Log\LoggerInterface;
/**
* Default implementation to provide suggestions mechanism for Elasticsearch
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Suggestions implements SuggestedQueriesInterface
{
@@ -56,6 +60,11 @@ class Suggestions implements SuggestedQueriesInterface
*/
private $fieldProvider;
+ /**
+ * @var LoggerInterface
+ */
+ private $logger;
+
/**
* Suggestions constructor.
*
@@ -66,6 +75,7 @@ class Suggestions implements SuggestedQueriesInterface
* @param SearchIndexNameResolver $searchIndexNameResolver
* @param StoreManager $storeManager
* @param FieldProviderInterface $fieldProvider
+ * @param LoggerInterface|null $logger
*/
public function __construct(
ScopeConfigInterface $scopeConfig,
@@ -74,7 +84,8 @@ public function __construct(
ConnectionManager $connectionManager,
SearchIndexNameResolver $searchIndexNameResolver,
StoreManager $storeManager,
- FieldProviderInterface $fieldProvider
+ FieldProviderInterface $fieldProvider,
+ LoggerInterface $logger = null
) {
$this->queryResultFactory = $queryResultFactory;
$this->connectionManager = $connectionManager;
@@ -83,6 +94,7 @@ public function __construct(
$this->searchIndexNameResolver = $searchIndexNameResolver;
$this->storeManager = $storeManager;
$this->fieldProvider = $fieldProvider;
+ $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
}
/**
@@ -93,8 +105,14 @@ public function getItems(QueryInterface $query)
$result = [];
if ($this->isSuggestionsAllowed()) {
$isResultsCountEnabled = $this->isResultsCountEnabled();
+ try {
+ $suggestions = $this->getSuggestions($query);
+ } catch (BadRequest400Exception $e) {
+ $this->logger->critical($e);
+ $suggestions = [];
+ }
- foreach ($this->getSuggestions($query) as $suggestion) {
+ foreach ($suggestions as $suggestion) {
$count = null;
if ($isResultsCountEnabled) {
$count = isset($suggestion['freq']) ? $suggestion['freq'] : null;
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Attribute.php b/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Attribute.php
new file mode 100644
index 0000000000000..53f036a3b8e38
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Attribute.php
@@ -0,0 +1,119 @@
+config = $config;
+ $this->indexerProcessor = $indexerProcessor;
+ $this->dimensionProvider = $dimensionProvider;
+ $this->indexerHandlerFactory = $indexerHandlerFactory;
+ }
+
+ /**
+ * Update catalog search indexer mapping if third party search engine is used.
+ *
+ * @param AttributeResourceModel $subject
+ * @param AttributeResourceModel $result
+ * @return AttributeResourceModel
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @throws LocalizedException
+ */
+ public function afterSave(
+ AttributeResourceModel $subject,
+ AttributeResourceModel $result
+ ): AttributeResourceModel {
+ $indexer = $this->indexerProcessor->getIndexer();
+ if ($this->isNewObject
+ && !$indexer->isScheduled()
+ && $this->config->isElasticsearchEnabled()
+ ) {
+ $indexerHandler = $this->indexerHandlerFactory->create(['data' => $indexer->getData()]);
+ if (!$indexerHandler instanceof ElasticsearchIndexerHandler) {
+ throw new LocalizedException(
+ __('Created indexer handler must be instance of %1.', ElasticsearchIndexerHandler::class)
+ );
+ }
+ foreach ($this->dimensionProvider->getIterator() as $dimension) {
+ $indexerHandler->updateIndex($dimension, $this->attributeCode);
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Set class variables before saving attribute.
+ *
+ * @param AttributeResourceModel $subject
+ * @param AbstractModel $attribute
+ * @return void
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function beforeSave(
+ AttributeResourceModel $subject,
+ AbstractModel $attribute
+ ): void {
+ $this->isNewObject = $attribute->isObjectNew();
+ $this->attributeCode = $attribute->getAttributeCode();
+ }
+}
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
index 847710eaa445a..90e21e9e3ea1e 100644
--- a/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php
@@ -5,12 +5,13 @@
*/
namespace Magento\Elasticsearch\Model\Indexer;
-use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
-use Magento\Framework\Indexer\SaveHandler\Batch;
-use Magento\Framework\Indexer\IndexStructureInterface;
use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\Indexer\IndexStructureInterface;
+use Magento\Framework\Indexer\SaveHandler\Batch;
+use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
+use Magento\Framework\Search\Request\Dimension;
/**
* Indexer Handler for Elasticsearch engine.
@@ -18,7 +19,7 @@
class IndexerHandler implements IndexerInterface
{
/**
- * Default batch size
+ * Size of default batch
*/
const DEFAULT_BATCH_SIZE = 500;
@@ -132,6 +133,22 @@ public function isAvailable($dimensions = [])
return $this->adapter->ping();
}
+ /**
+ * Update mapping data for index.
+ *
+ * @param Dimension[] $dimensions
+ * @param string $attributeCode
+ * @return IndexerInterface
+ */
+ public function updateIndex(array $dimensions, string $attributeCode): IndexerInterface
+ {
+ $dimension = current($dimensions);
+ $scopeId = (int)$this->scopeResolver->getScope($dimension->getValue())->getId();
+ $this->adapter->updateIndexMapping($scopeId, $this->getIndexerId(), $attributeCode);
+
+ return $this;
+ }
+
/**
* Returns indexer id.
*
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
index fc146e801124a..398c79f056810 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Elasticsearch5/Model/Client/ElasticsearchTest.php
@@ -69,6 +69,7 @@ protected function setUp(): void
'create',
'delete',
'putMapping',
+ 'getMapping',
'deleteMapping',
'stats',
'updateAliases',
@@ -533,6 +534,22 @@ public function testDeleteMappingFailure()
);
}
+ /**
+ * Test get Elasticsearch mapping process.
+ *
+ * @return void
+ */
+ public function testGetMapping(): void
+ {
+ $params = ['index' => 'indexName'];
+ $this->indicesMock->expects($this->once())
+ ->method('getMapping')
+ ->with($params)
+ ->willReturn([]);
+
+ $this->model->getMapping($params);
+ }
+
/**
* Test query() method
* @return void
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
index dd4bffe8e7c33..5abe800884ced 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
@@ -11,14 +11,18 @@
use Elasticsearch\Namespaces\IndicesNamespace;
use Magento\AdvancedSearch\Model\Client\ClientInterface as ElasticsearchClient;
use Magento\AdvancedSearch\Model\Client\ClientOptionsInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
use Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface;
use Magento\Elasticsearch\Model\Adapter\Elasticsearch as ElasticsearchAdapter;
use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\StaticField;
use Magento\Elasticsearch\Model\Adapter\Index\BuilderInterface;
use Magento\Elasticsearch\Model\Adapter\Index\IndexNameResolver;
use Magento\Elasticsearch\Model\Config;
use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\ArrayManager;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
@@ -81,6 +85,21 @@ class ElasticsearchTest extends TestCase
*/
protected $indexNameResolver;
+ /**
+ * @var ProductAttributeRepositoryInterface|MockObject
+ */
+ private $productAttributeRepository;
+
+ /**
+ * @var StaticField|MockObject
+ */
+ private $staticFieldProvider;
+
+ /**
+ * @var ArrayManager|MockObject
+ */
+ private $arrayManager;
+
/**
* Setup
*
@@ -177,9 +196,17 @@ protected function setUp(): void
)
->disableOriginalConstructor()
->getMock();
- $this->batchDocumentDataMapper = $this->getMockBuilder(
- BatchDataMapperInterface::class
- )->disableOriginalConstructor()
+ $this->batchDocumentDataMapper = $this->getMockBuilder(BatchDataMapperInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $this->productAttributeRepository = $this->getMockBuilder(ProductAttributeRepositoryInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $this->staticFieldProvider = $this->getMockBuilder(StaticField::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->arrayManager = $this->getMockBuilder(ArrayManager::class)
+ ->disableOriginalConstructor()
->getMock();
$this->model = $this->objectManager->getObject(
\Magento\Elasticsearch\Model\Adapter\Elasticsearch::class,
@@ -192,6 +219,9 @@ protected function setUp(): void
'logger' => $this->logger,
'indexNameResolver' => $this->indexNameResolver,
'options' => [],
+ 'productAttributeRepository' => $this->productAttributeRepository,
+ 'staticFieldProvider' => $this->staticFieldProvider,
+ 'arrayManager' => $this->arrayManager,
]
);
}
@@ -459,6 +489,81 @@ public function testUpdateAliasWithoutOldIndex()
$this->assertEquals($this->model, $this->model->updateAlias(1, 'product'));
}
+ /**
+ * Test update Elasticsearch mapping for index without alias definition.
+ *
+ * @return void
+ */
+ public function testUpdateIndexMappingWithoutAliasDefinition(): void
+ {
+ $storeId = 1;
+ $mappedIndexerId = 'product';
+
+ $this->indexNameResolver->expects($this->once())
+ ->method('getIndexFromAlias')
+ ->with($storeId, $mappedIndexerId)
+ ->willReturn('');
+
+ $this->productAttributeRepository->expects($this->never())
+ ->method('get');
+
+ $this->model->updateIndexMapping($storeId, $mappedIndexerId, 'attribute_code');
+ }
+
+ /**
+ * Test update Elasticsearch mapping for index with alias definition.
+ *
+ * @return void
+ */
+ public function testUpdateIndexMappingWithAliasDefinition(): void
+ {
+ $storeId = 1;
+ $mappedIndexerId = 'product';
+ $indexName = '_product_1_v1';
+ $attributeCode = 'example_attribute_code';
+
+ $this->indexNameResolver->expects($this->once())
+ ->method('getIndexFromAlias')
+ ->with($storeId, $mappedIndexerId)
+ ->willReturn($indexName);
+
+ $attribute = $this->getMockBuilder(AbstractAttribute::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $this->productAttributeRepository->expects($this->once())
+ ->method('get')
+ ->with($attributeCode)
+ ->willReturn($attribute);
+
+ $this->staticFieldProvider->expects($this->once())
+ ->method('getField')
+ ->with($attribute)
+ ->willReturn([$attributeCode => ['type' => 'text']]);
+
+ $mappedAttributes = ['another_attribute_code' => 'attribute_mapping'];
+ $this->client->expects($this->once())
+ ->method('getMapping')
+ ->with(['index' => $indexName])
+ ->willReturn(['properties' => $mappedAttributes]);
+
+ $this->arrayManager->expects($this->once())
+ ->method('findPath')
+ ->with('properties', ['properties' => $mappedAttributes])
+ ->willReturn('example/path/to/properties');
+
+ $this->arrayManager->expects($this->once())
+ ->method('get')
+ ->with('example/path/to/properties', ['properties' => $mappedAttributes], [])
+ ->willReturn($mappedAttributes);
+
+ $this->client->expects($this->once())
+ ->method('addFieldsMapping')
+ ->with([$attributeCode => ['type' => 'text']], $indexName, 'product');
+
+ $this->model->updateIndexMapping($storeId, $mappedIndexerId, $attributeCode);
+ }
+
/**
* Get elasticsearch client options
*
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php
index 7151677db3405..9f1c5db60b3d8 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/DataProvider/Base/SuggestionsTest.php
@@ -7,7 +7,10 @@
namespace Magento\Elasticsearch\Test\Unit\Model\DataProvider\Base;
+use Elasticsearch\Common\Exceptions\BadRequest400Exception;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\Model\DataProvider\Base\Suggestions;
use Magento\Elasticsearch\Model\DataProvider\Suggestions as SuggestionsDataProvider;
use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
use Magento\Elasticsearch\SearchAdapter\SearchIndexNameResolver;
@@ -21,6 +24,7 @@
use Magento\Store\Model\StoreManagerInterface as StoreManager;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -62,6 +66,21 @@ class SuggestionsTest extends TestCase
*/
private $storeManager;
+ /**
+ * @var FieldProviderInterface|MockObject
+ */
+ private $fieldProvider;
+
+ /**
+ * @var LoggerInterface|MockObject
+ */
+ private $logger;
+
+ /**
+ * @var Elasticsearch|MockObject
+ */
+ private $client;
+
/**
* @var QueryInterface|MockObject
*/
@@ -99,7 +118,19 @@ protected function setUp(): void
->setMethods(['getIndexName'])
->getMock();
- $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+ $this->storeManager = $this->getMockBuilder(StoreManager::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $this->fieldProvider = $this->getMockBuilder(FieldProviderInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $this->logger = $this->getMockBuilder(LoggerInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $this->client = $this->getMockBuilder(Elasticsearch::class)
->disableOriginalConstructor()
->getMock();
@@ -110,81 +141,155 @@ protected function setUp(): void
$objectManager = new ObjectManagerHelper($this);
$this->model = $objectManager->getObject(
- \Magento\Elasticsearch\Model\DataProvider\Base\Suggestions::class,
+ Suggestions::class,
[
'queryResultFactory' => $this->queryResultFactory,
'connectionManager' => $this->connectionManager,
'scopeConfig' => $this->scopeConfig,
'config' => $this->config,
'searchIndexNameResolver' => $this->searchIndexNameResolver,
- 'storeManager' => $this->storeManager
+ 'storeManager' => $this->storeManager,
+ 'fieldProvider' => $this->fieldProvider,
+ 'logger' => $this->logger,
]
);
}
/**
- * Test getItems() method
+ * Test get items process with search suggestions disabled.
+ * @return void
*/
- public function testGetItems()
+ public function testGetItemsWithDisabledSearchSuggestion(): void
{
- $this->scopeConfig->expects($this->any())
- ->method('getValue')
- ->willReturn(1);
-
- $this->config->expects($this->any())
- ->method('isElasticsearchEnabled')
- ->willReturn(1);
-
- $store = $this->getMockBuilder(StoreInterface::class)
- ->disableOriginalConstructor()
- ->getMockForAbstractClass();
+ $this->scopeConfig->expects($this->once())
+ ->method('isSetFlag')
+ ->willReturn(false);
- $this->storeManager->expects($this->any())
- ->method('getStore')
- ->willReturn($store);
-
- $store->expects($this->any())
- ->method('getId')
- ->willReturn(1);
+ $this->scopeConfig->expects($this->never())
+ ->method('getValue');
- $this->searchIndexNameResolver->expects($this->any())
- ->method('getIndexName')
- ->willReturn('magento2_product_1');
+ $this->config->expects($this->once())
+ ->method('isElasticsearchEnabled')
+ ->willReturn(true);
- $this->query->expects($this->any())
- ->method('getQueryText')
- ->willReturn('query');
+ $this->logger->expects($this->never())
+ ->method('critical');
- $client = $this->getMockBuilder(Elasticsearch::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $this->queryResultFactory->expects($this->never())
+ ->method('create');
- $this->connectionManager->expects($this->any())
- ->method('getConnection')
- ->willReturn($client);
+ $this->assertEmpty($this->model->getItems($this->query));
+ }
- $client->expects($this->any())
+ /**
+ * Test get items process with search suggestions enabled.
+ * @return void
+ */
+ public function testGetItemsWithEnabledSearchSuggestion(): void
+ {
+ $this->prepareSearchQuery();
+ $this->client->expects($this->once())
->method('query')
->willReturn([
'suggest' => [
'phrase_field' => [
- 'options' => [
- 'text' => 'query',
- 'score' => 1,
- 'freq' => 1,
+ [
+ 'options' => [
+ 'suggestion' => [
+ 'text' => 'query',
+ 'score' => 1,
+ 'freq' => 1,
+ ]
+ ]
]
],
],
]);
+ $this->logger->expects($this->never())
+ ->method('critical');
+
$query = $this->getMockBuilder(QueryResult::class)
->disableOriginalConstructor()
->getMock();
- $this->queryResultFactory->expects($this->any())
+ $this->queryResultFactory->expects($this->once())
->method('create')
->willReturn($query);
- $this->assertIsArray($this->model->getItems($this->query));
+ $this->assertEquals([$query], $this->model->getItems($this->query));
+ }
+
+ /**
+ * Test get items process when throwing an exception.
+ * @return void
+ */
+ public function testGetItemsException(): void
+ {
+ $this->prepareSearchQuery();
+ $exception = new BadRequest400Exception();
+
+ $this->client->expects($this->once())
+ ->method('query')
+ ->willThrowException($exception);
+
+ $this->logger->expects($this->once())
+ ->method('critical')
+ ->with($exception);
+
+ $this->queryResultFactory->expects($this->never())
+ ->method('create');
+
+ $this->assertEmpty($this->model->getItems($this->query));
+ }
+
+ /**
+ * Prepare Mocks for default get items process.
+ * @return void
+ */
+ private function prepareSearchQuery(): void
+ {
+ $storeId = 1;
+
+ $this->scopeConfig->expects($this->exactly(2))
+ ->method('isSetFlag')
+ ->willReturn(true);
+
+ $this->scopeConfig->expects($this->once())
+ ->method('getValue')
+ ->willReturn(1);
+
+ $this->config->expects($this->once())
+ ->method('isElasticsearchEnabled')
+ ->willReturn(true);
+
+ $store = $this->getMockBuilder(StoreInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $store->expects($this->once())
+ ->method('getId')
+ ->willReturn($storeId);
+
+ $this->storeManager->expects($this->once())
+ ->method('getStore')
+ ->willReturn($store);
+
+ $this->searchIndexNameResolver->expects($this->once())
+ ->method('getIndexName')
+ ->with($storeId, Config::ELASTICSEARCH_TYPE_DEFAULT)
+ ->willReturn('magento2_product_1');
+
+ $this->query->expects($this->once())
+ ->method('getQueryText')
+ ->willReturn('query');
+
+ $this->fieldProvider->expects($this->once())
+ ->method('getFields')
+ ->willReturn([]);
+
+ $this->connectionManager->expects($this->once())
+ ->method('getConnection')
+ ->willReturn($this->client);
}
}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
new file mode 100644
index 0000000000000..801c7ca3be216
--- /dev/null
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/Fulltext/Plugin/Category/Product/AttributeTest.php
@@ -0,0 +1,173 @@
+configMock = $this->createMock(Config::class);
+ $this->indexerProcessorMock = $this->createMock(Processor::class);
+ $this->dimensionProviderMock = $this->getMockBuilder(DimensionProviderInterface::class)
+ ->getMockForAbstractClass();
+ $this->indexerHandlerFactoryMock = $this->createMock(IndexerHandlerFactory::class);
+
+ $this->attributePlugin = (new ObjectManager($this))->getObject(
+ AttributePlugin::class,
+ [
+ 'config' => $this->configMock,
+ 'indexerProcessor' => $this->indexerProcessorMock,
+ 'dimensionProvider' => $this->dimensionProviderMock,
+ 'indexerHandlerFactory' => $this->indexerHandlerFactoryMock,
+ ]
+ );
+ }
+
+ /**
+ * Test update catalog search indexer process.
+ *
+ * @param bool $isNewObject
+ * @param bool $isElasticsearchEnabled
+ * @param array $dimensions
+ * @return void
+ * @dataProvider afterSaveDataProvider
+ *
+ */
+ public function testAfterSave(bool $isNewObject, bool $isElasticsearchEnabled, array $dimensions): void
+ {
+ /** @var AttributeModel|MockObject $attributeMock */
+ $attributeMock = $this->createMock(AttributeModel::class);
+ $attributeMock->expects($this->once())
+ ->method('isObjectNew')
+ ->willReturn($isNewObject);
+
+ $attributeMock->expects($this->once())
+ ->method('getAttributeCode')
+ ->willReturn('example_attribute_code');
+
+ /** @var AttributeResourceModel|MockObject $subjectMock */
+ $subjectMock = $this->createMock(AttributeResourceModel::class);
+ $this->attributePlugin->beforeSave($subjectMock, $attributeMock);
+
+ $indexerData = ['indexer_example_data'];
+
+ /** @var IndexerInterface|MockObject $indexerMock */
+ $indexerMock = $this->getMockBuilder(IndexerInterface::class)
+ ->setMethods(['getData'])
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $indexerMock->expects($this->getExpectsCount($isNewObject, $isElasticsearchEnabled))
+ ->method('getData')
+ ->willReturn($indexerData);
+
+ $this->indexerProcessorMock->expects($this->once())
+ ->method('getIndexer')
+ ->willReturn($indexerMock);
+
+ $this->configMock->expects($isNewObject ? $this->once() : $this->never())
+ ->method('isElasticsearchEnabled')
+ ->willReturn($isElasticsearchEnabled);
+
+ /** @var IndexerHandler|MockObject $indexerHandlerMock */
+ $indexerHandlerMock = $this->createMock(IndexerHandler::class);
+
+ $indexerHandlerMock
+ ->expects(($isNewObject && $isElasticsearchEnabled) ? $this->exactly(count($dimensions)) : $this->never())
+ ->method('updateIndex')
+ ->willReturnSelf();
+
+ $this->indexerHandlerFactoryMock->expects($this->getExpectsCount($isNewObject, $isElasticsearchEnabled))
+ ->method('create')
+ ->with(['data' => $indexerData])
+ ->willReturn($indexerHandlerMock);
+
+ $this->dimensionProviderMock->expects($this->getExpectsCount($isNewObject, $isElasticsearchEnabled))
+ ->method('getIterator')
+ ->willReturn(new ArrayIterator($dimensions));
+
+ $this->assertEquals($subjectMock, $this->attributePlugin->afterSave($subjectMock, $subjectMock));
+ }
+
+ /**
+ * DataProvider for testAfterSave().
+ *
+ * @return array
+ */
+ public function afterSaveDataProvider(): array
+ {
+ $dimensions = [['scope' => 1], ['scope' => 2]];
+
+ return [
+ 'save_existing_object' => [false, false, $dimensions],
+ 'save_with_another_search_engine' => [true, false, $dimensions],
+ 'save_with_elasticsearch' => [true, true, []],
+ 'save_with_elasticsearch_and_dimensions' => [true, true, $dimensions],
+ ];
+ }
+
+ /**
+ * Retrieves how many times method is executed.
+ *
+ * @param bool $isNewObject
+ * @param bool $isElasticsearchEnabled
+ * @return InvokedCountMatcher
+ */
+ private function getExpectsCount(bool $isNewObject, bool $isElasticsearchEnabled): InvokedCountMatcher
+ {
+ return ($isNewObject && $isElasticsearchEnabled) ? $this->once() : $this->never();
+ }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
index a147ca1b42b3b..3a9aef68c328c 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/Indexer/IndexerHandlerTest.php
@@ -267,4 +267,45 @@ public function testCleanIndex()
$this->assertEquals($model, $result);
}
+
+ /**
+ * Test mapping data is updated for index.
+ *
+ * @return void
+ */
+ public function testUpdateIndex(): void
+ {
+ $dimensionValue = 'SomeDimension';
+ $indexMapping = 'some_index_mapping';
+ $attributeCode = 'example_attribute_code';
+
+ $dimension = $this->getMockBuilder(Dimension::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $dimension->expects($this->once())
+ ->method('getValue')
+ ->willReturn($dimensionValue);
+
+ $this->scopeResolver->expects($this->once())
+ ->method('getScope')
+ ->with($dimensionValue)
+ ->willReturn($this->scopeInterface);
+
+ $this->scopeInterface->expects($this->once())
+ ->method('getId')
+ ->willReturn(1);
+
+ $this->indexNameResolver->expects($this->once())
+ ->method('getIndexMapping')
+ ->with('catalogsearch_fulltext')
+ ->willReturn($indexMapping);
+
+ $this->adapter->expects($this->once())
+ ->method('updateIndexMapping')
+ ->with(1, $indexMapping, $attributeCode)
+ ->willReturnSelf();
+
+ $this->model->updateIndex([$dimension], $attributeCode);
+ }
}
diff --git a/app/code/Magento/Elasticsearch/etc/di.xml b/app/code/Magento/Elasticsearch/etc/di.xml
index 6c1a771958081..edec07cb5d51e 100644
--- a/app/code/Magento/Elasticsearch/etc/di.xml
+++ b/app/code/Magento/Elasticsearch/etc/di.xml
@@ -475,6 +475,11 @@
Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter
+
+
+ elasticsearch5StaticFieldProvider
+
+
elasticsearch5FieldProvider
@@ -550,4 +555,12 @@
+
+
+ Magento\Store\Model\StoreDimensionProvider
+
+
+
+
diff --git a/app/code/Magento/Elasticsearch/i18n/en_US.csv b/app/code/Magento/Elasticsearch/i18n/en_US.csv
index 3a0ec556dbf8d..e36b3e054accd 100644
--- a/app/code/Magento/Elasticsearch/i18n/en_US.csv
+++ b/app/code/Magento/Elasticsearch/i18n/en_US.csv
@@ -11,3 +11,4 @@
"Elasticsearch Server Timeout","Elasticsearch Server Timeout"
"Test Connection","Test Connection"
"Minimum Terms to Match","Minimum Terms to Match"
+"Created indexer handler must be instance of %1.", "Created indexer handler must be instance of %1."
diff --git a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
index a6ca9ac690b33..2d787f4d4377d 100644
--- a/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch6/Model/Client/Elasticsearch.php
@@ -179,6 +179,23 @@ public function createIndex($index, $settings)
);
}
+ /**
+ * Add/update an Elasticsearch index settings.
+ *
+ * @param string $index
+ * @param array $settings
+ * @return void
+ */
+ public function putIndexSettings(string $index, array $settings): void
+ {
+ $this->getClient()->indices()->putSettings(
+ [
+ 'index' => $index,
+ 'body' => $settings,
+ ]
+ );
+ }
+
/**
* Delete an Elasticsearch index.
*
@@ -332,6 +349,17 @@ public function addFieldsMapping(array $fields, $index, $entityType)
$this->getClient()->indices()->putMapping($params);
}
+ /**
+ * Get mapping from Elasticsearch index.
+ *
+ * @param array $params
+ * @return array
+ */
+ public function getMapping(array $params): array
+ {
+ return $this->getClient()->indices()->getMapping($params);
+ }
+
/**
* Delete mapping in Elasticsearch index
*
diff --git a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
index 427e630ac2099..f52e24d72e4d4 100644
--- a/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch6/Test/Unit/Model/Client/ElasticsearchTest.php
@@ -73,6 +73,7 @@ protected function setUp(): void
'delete',
'putMapping',
'deleteMapping',
+ 'getMapping',
'stats',
'updateAliases',
'existsAlias',
@@ -608,6 +609,22 @@ public function testDeleteMappingFailure()
);
}
+ /**
+ * Test get Elasticsearch mapping process.
+ *
+ * @return void
+ */
+ public function testGetMapping(): void
+ {
+ $params = ['index' => 'indexName'];
+ $this->indicesMock->expects($this->once())
+ ->method('getMapping')
+ ->with($params)
+ ->willReturn([]);
+
+ $this->model->getMapping($params);
+ }
+
/**
* Test query() method
* @return void
diff --git a/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php b/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
index a16a70b1cd702..d193c8aa108c8 100644
--- a/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
+++ b/app/code/Magento/Elasticsearch7/Model/Client/Elasticsearch.php
@@ -179,6 +179,23 @@ public function createIndex(string $index, array $settings)
);
}
+ /**
+ * Add/update an Elasticsearch index settings.
+ *
+ * @param string $index
+ * @param array $settings
+ * @return void
+ */
+ public function putIndexSettings(string $index, array $settings): void
+ {
+ $this->getElasticsearchClient()->indices()->putSettings(
+ [
+ 'index' => $index,
+ 'body' => $settings,
+ ]
+ );
+ }
+
/**
* Delete an Elasticsearch 7 index.
*
@@ -350,6 +367,17 @@ public function query(array $query): array
return $this->getElasticsearchClient()->search($query);
}
+ /**
+ * Get mapping from Elasticsearch index.
+ *
+ * @param array $params
+ * @return array
+ */
+ public function getMapping(array $params): array
+ {
+ return $this->getElasticsearchClient()->indices()->getMapping($params);
+ }
+
/**
* Delete mapping in Elasticsearch 7 index
*
diff --git a/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php b/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
index a31a1971a5acc..3b3cbcfbb15f8 100644
--- a/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
+++ b/app/code/Magento/Elasticsearch7/Test/Unit/Model/Client/ElasticsearchTest.php
@@ -73,6 +73,7 @@ protected function setUp(): void
'delete',
'putMapping',
'deleteMapping',
+ 'getMapping',
'stats',
'updateAliases',
'existsAlias',
@@ -608,6 +609,22 @@ public function testDeleteMappingFailure()
);
}
+ /**
+ * Test get Elasticsearch mapping process.
+ *
+ * @return void
+ */
+ public function testGetMapping(): void
+ {
+ $params = ['index' => 'indexName'];
+ $this->indicesMock->expects($this->once())
+ ->method('getMapping')
+ ->with($params)
+ ->willReturn([]);
+
+ $this->model->getMapping($params);
+ }
+
/**
* Test query() method
* @return void
diff --git a/app/code/Magento/GraphQl/etc/schema.graphqls b/app/code/Magento/GraphQl/etc/schema.graphqls
index 0212d32db0f2f..2595ad09c072a 100644
--- a/app/code/Magento/GraphQl/etc/schema.graphqls
+++ b/app/code/Magento/GraphQl/etc/schema.graphqls
@@ -277,3 +277,8 @@ enum CurrencyEnum @doc(description: "The list of available currency codes") {
TRL
XPF
}
+
+input EnteredOptionInput @doc(description: "Defines a customer-entered option") {
+ uid: ID! @doc(description: "An encoded ID")
+ value: String! @doc(description: "Text the customer entered")
+}
diff --git a/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php b/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php
index de16a798983c0..89cb960e78bb8 100644
--- a/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php
+++ b/app/code/Magento/LoginAsCustomer/Model/Resolver/IsLoginAsCustomerEnabledResolver.php
@@ -7,7 +7,7 @@
namespace Magento\LoginAsCustomer\Model\Resolver;
-use Magento\LoginAsCustomer\Model\IsLoginAsCustomerEnabledForCustomerResultFactory;
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory;
use Magento\LoginAsCustomerApi\Api\ConfigInterface;
use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
@@ -23,17 +23,17 @@ class IsLoginAsCustomerEnabledResolver implements IsLoginAsCustomerEnabledForCus
private $config;
/**
- * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+ * @var IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory
*/
private $resultFactory;
/**
* @param ConfigInterface $config
- * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+ * @param IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
*/
public function __construct(
ConfigInterface $config,
- IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+ IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
) {
$this->config = $config;
$this->resultFactory = $resultFactory;
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebSiteAndGroupActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebSiteAndGroupActionGroup.xml
new file mode 100644
index 0000000000000..e7f55e69b1cda
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebSiteAndGroupActionGroup.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/CustomerData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/CustomerData.xml
new file mode 100644
index 0000000000000..10cdc87be6430
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/CustomerData.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ AssistanceAllowed
+
+
+ AssistanceAllowed
+
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/ExtensionAttributeAssistanceData.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/ExtensionAttributeAssistanceData.xml
new file mode 100644
index 0000000000000..44582cfae5c36
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Data/ExtensionAttributeAssistanceData.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ 1
+
+
+ 2
+
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
new file mode 100644
index 0000000000000..1a31afad3fbf0
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
index 9ebeae23d47a8..8902877b38e54 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminChangUserAccessToLoginAsCustomerButtonTest.xml
@@ -27,7 +27,7 @@
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
index 42d53113e20f4..de9790894015c 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
@@ -20,7 +20,7 @@
-
-
-
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
index bf2556b30967b..5b5e9e21113c8 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerLoggingTest.xml
@@ -26,8 +26,8 @@
stepKey="enableLoginAsCustomerAutoDetection"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index acae07d1cda11..da966fdcc1291 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -23,7 +23,7 @@
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
index a4994d5c041d2..8169b9df4c43d 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerPlaceOrderTest.xml
@@ -28,7 +28,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
index 44409471821db..bc4c4adc3ac5a 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerSubscribeToNewsletterTest.xml
@@ -24,7 +24,7 @@
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
index 4f484e73d580b..e7b5de55a56cb 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserLogoutTest.xml
@@ -25,7 +25,7 @@
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
index e4cd48d8e868e..5bbc218e0a948 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerUserSingleSessionTest.xml
@@ -17,17 +17,14 @@
value="Verify Admin users can have only one 'Login as Customer' session at a time"/>
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
index 52f5d7c51dcd1..50513797d06e9 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminNoAccessToLoginAsCustomerButtonTest.xml
@@ -29,7 +29,7 @@
-
-
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
index 2bf364b29ba8d..ea06263901b9e 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
@@ -28,7 +28,7 @@
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
index 6874fcb4fd220..4f85b9167fa54 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerBannerPresentOnAllPagesInSessionTest.xml
@@ -27,7 +27,7 @@
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
index d953c493562c6..351a3c569ce24 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerNotificationBannerTest.xml
@@ -19,7 +19,7 @@
- 10
-
+
3
-
diff --git a/app/code/Magento/LoginAsCustomer/etc/di.xml b/app/code/Magento/LoginAsCustomer/etc/di.xml
index e9e4983957d31..9927237c51db6 100755
--- a/app/code/Magento/LoginAsCustomer/etc/di.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/di.xml
@@ -22,10 +22,10 @@
+
-
diff --git a/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php b/app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php
similarity index 76%
rename from app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
rename to app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php
index 6937a11eb3b58..c852327743760 100644
--- a/app/code/Magento/LoginAsCustomer/Model/IsLoginAsCustomerEnabledForCustomerChain.php
+++ b/app/code/Magento/LoginAsCustomerApi/Model/IsLoginAsCustomerEnabledForCustomerChain.php
@@ -5,12 +5,12 @@
*/
declare(strict_types=1);
-namespace Magento\LoginAsCustomer\Model;
+namespace Magento\LoginAsCustomerApi\Model;
use Magento\LoginAsCustomerApi\Api\ConfigInterface;
use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterface;
+use Magento\LoginAsCustomerApi\Api\Data\IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory;
use Magento\LoginAsCustomerApi\Api\IsLoginAsCustomerEnabledForCustomerInterface;
-use Magento\LoginAsCustomerApi\Model\IsLoginAsCustomerEnabledForCustomerResolverInterface;
/**
* @inheritdoc
@@ -23,7 +23,7 @@ class IsLoginAsCustomerEnabledForCustomerChain implements IsLoginAsCustomerEnabl
private $config;
/**
- * @var IsLoginAsCustomerEnabledForCustomerResultFactory
+ * @var IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory
*/
private $resultFactory;
@@ -34,12 +34,12 @@ class IsLoginAsCustomerEnabledForCustomerChain implements IsLoginAsCustomerEnabl
/**
* @param ConfigInterface $config
- * @param IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory
+ * @param IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory
* @param array $resolvers
*/
public function __construct(
ConfigInterface $config,
- IsLoginAsCustomerEnabledForCustomerResultFactory $resultFactory,
+ IsLoginAsCustomerEnabledForCustomerResultInterfaceFactory $resultFactory,
array $resolvers = []
) {
$this->config = $config;
@@ -53,7 +53,7 @@ public function __construct(
public function execute(int $customerId): IsLoginAsCustomerEnabledForCustomerResultInterface
{
$messages = [[]];
- /** @var IsLoginAsCustomerEnabledForCustomerResultInterface $resolver */
+ /** @var IsLoginAsCustomerEnabledForCustomerInterface $resolver */
foreach ($this->resolvers as $resolver) {
$resolverResult = $resolver->execute($customerId);
if (!$resolverResult->isEnabled()) {
diff --git a/app/code/Magento/LoginAsCustomerApi/etc/di.xml b/app/code/Magento/LoginAsCustomerApi/etc/di.xml
new file mode 100644
index 0000000000000..18915f8f16267
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerApi/etc/di.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php b/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php
new file mode 100644
index 0000000000000..7cd54567d26d5
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Api/ConfigInterface.php
@@ -0,0 +1,28 @@
+config = $config;
+ $this->json = $json;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getJsLayout()
+ {
+ $layout = $this->json->unserialize(parent::getJsLayout());
+
+ $layout['components']['lac-not-allowed-popup']['title'] = __('Login as Customer not enabled');
+ $layout['components']['lac-not-allowed-popup']['content'] = __(
+ 'The user has not enabled the "Allow remote shopping assistance" functionality. '
+ . 'Contact the customer to discuss this user configuration.'
+ );
+
+ return $this->json->serialize($layout);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function toHtml()
+ {
+ if (!$this->config->isEnabled()) {
+ return '';
+ }
+ return parent::toHtml();
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/LICENSE.txt b/app/code/Magento/LoginAsCustomerAssistance/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/LoginAsCustomerAssistance/LICENSE_AFL.txt b/app/code/Magento/LoginAsCustomerAssistance/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php b/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
new file mode 100644
index 0000000000000..2fce39cd4e85e
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/Config.php
@@ -0,0 +1,62 @@
+scopeConfig = $scopeConfig;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getShoppingAssistanceCheckboxTitle(): string
+ {
+ return (string)$this->scopeConfig->getValue(
+ self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TITLE,
+ ScopeInterface::SCOPE_WEBSITE
+ );
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getShoppingAssistanceCheckboxTooltip(): string
+ {
+ return (string)$this->scopeConfig->getValue(
+ self::XML_PATH_SHOPPING_ASSISTANCE_CHECKBOX_TOOLTIP,
+ ScopeInterface::SCOPE_WEBSITE
+ );
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php b/app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php
new file mode 100644
index 0000000000000..da77c96164228
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/IsAssistanceEnabled.php
@@ -0,0 +1,54 @@
+getLoginAsCustomerAssistanceAllowed = $getLoginAsCustomerAssistanceAllowed;
+ }
+
+ /**
+ * Check if customer allows Login as Customer assistance by Customer id.
+ *
+ * @param int $customerId
+ * @return bool
+ */
+ public function execute(int $customerId): bool
+ {
+ if (!isset($this->registry[$customerId])) {
+ $this->registry[$customerId] = $this->getLoginAsCustomerAssistanceAllowed->execute($customerId);
+ }
+
+ return $this->registry[$customerId];
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php b/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
new file mode 100644
index 0000000000000..966ea477b2394
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/Processor/IsLoginAsCustomerAllowedResolver.php
@@ -0,0 +1,54 @@
+isAssistanceEnabled = $isAssistanceEnabled;
+ $this->resultFactory = $resultFactory;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function execute(int $customerId): IsLoginAsCustomerEnabledForCustomerResultInterface
+ {
+ $messages = [];
+ if (!$this->isAssistanceEnabled->execute($customerId)) {
+ $messages[] = __('Login as Customer assistance is disabled for this Customer.');
+ }
+
+ return $this->resultFactory->create(['messages' => $messages]);
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/DeleteLoginAsCustomerAssistanceAllowed.php b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/DeleteLoginAsCustomerAssistanceAllowed.php
new file mode 100644
index 0000000000000..360f2e2799282
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/DeleteLoginAsCustomerAssistanceAllowed.php
@@ -0,0 +1,49 @@
+resourceConnection = $resourceConnection;
+ }
+
+ /**
+ * Delete Login as Customer assistance allowed record by Customer id.
+ *
+ * @param int $customerId
+ * @return void
+ */
+ public function execute(int $customerId): void
+ {
+ $connection = $this->resourceConnection->getConnection();
+ $tableName = $this->resourceConnection->getTableName('login_as_customer_assistance_allowed');
+
+ $connection->delete(
+ $tableName,
+ [
+ 'customer_id = ?' => $customerId
+ ]
+ );
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/GetLoginAsCustomerAssistanceAllowed.php b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/GetLoginAsCustomerAssistanceAllowed.php
new file mode 100644
index 0000000000000..412fd86351988
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/GetLoginAsCustomerAssistanceAllowed.php
@@ -0,0 +1,50 @@
+resourceConnection = $resourceConnection;
+ }
+
+ /**
+ * Get Login as Customer assistance allowed record by Customer id.
+ *
+ * @param int $customerId
+ * @return bool
+ */
+ public function execute(int $customerId): bool
+ {
+ $connection = $this->resourceConnection->getConnection();
+ $tableName = $this->resourceConnection->getTableName('login_as_customer_assistance_allowed');
+
+ $select = $connection->select()
+ ->from(
+ $tableName
+ )
+ ->where('customer_id = ?', $customerId);
+
+ return !!$connection->fetchOne($select);
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php
new file mode 100644
index 0000000000000..c3b396bbe332d
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/ResourceModel/SaveLoginAsCustomerAssistanceAllowed.php
@@ -0,0 +1,49 @@
+resourceConnection = $resourceConnection;
+ }
+
+ /**
+ * Save Login as Customer assistance allowed record by Customer id.
+ *
+ * @param int $customerId
+ * @return void
+ */
+ public function execute(int $customerId): void
+ {
+ $connection = $this->resourceConnection->getConnection();
+ $tableName = $this->resourceConnection->getTableName('login_as_customer_assistance_allowed');
+
+ $connection->insertOnDuplicate(
+ $tableName,
+ [
+ 'customer_id' => $customerId
+ ]
+ );
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php b/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php
new file mode 100644
index 0000000000000..9131599d9cba0
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Model/SetAssistance.php
@@ -0,0 +1,101 @@
+customerExtensionFactory = $customerExtensionFactory;
+ $this->customerRepository = $customerRepository;
+ $this->deleteLoginAsCustomerAssistanceAllowed = $deleteLoginAsCustomerAssistanceAllowed;
+ $this->saveLoginAsCustomerAssistanceAllowed = $saveLoginAsCustomerAssistanceAllowed;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function execute(int $customerId, bool $isEnabled): void
+ {
+ if ($this->isUpdateRequired($customerId, $isEnabled)) {
+ if ($isEnabled) {
+ $this->saveLoginAsCustomerAssistanceAllowed->execute($customerId);
+ } else {
+ $this->deleteLoginAsCustomerAssistanceAllowed->execute($customerId);
+ }
+ $this->updateRegistry($customerId, $isEnabled);
+ }
+ }
+
+ /**
+ * Check if 'assistance_allowed' cached value differs from actual.
+ *
+ * @param int $customerId
+ * @param bool $isEnabled
+ * @return bool
+ */
+ private function isUpdateRequired(int $customerId, bool $isEnabled): bool
+ {
+ return !isset($this->registry[$customerId]) || $this->registry[$customerId] !== $isEnabled;
+ }
+
+ /**
+ * Update 'assistance_allowed' cached value.
+ *
+ * @param int $customerId
+ * @param bool $isEnabled
+ */
+ private function updateRegistry(int $customerId, bool $isEnabled): void
+ {
+ $this->registry[$customerId] = $isEnabled;
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
new file mode 100644
index 0000000000000..9da329b4a3991
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerDataValidatePlugin.php
@@ -0,0 +1,133 @@
+authorization = $authorization;
+ $this->getLoginAsCustomerAssistanceAllowed = $getLoginAsCustomerAssistanceAllowed;
+ }
+
+ /**
+ * Check if User have permission to change Customers Opt-In preference.
+ *
+ * @param Form $subject
+ * @param RequestInterface $request
+ * @param null|string $scope
+ * @param bool $scopeOnly
+ * @throws \Magento\Framework\Validator\Exception
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function beforeExtractData(
+ Form $subject,
+ RequestInterface $request,
+ $scope = null,
+ $scopeOnly = true
+ ): void {
+ if ($this->isSetAssistanceAllowedParam($request)
+ && !$this->authorization->isAllowed('Magento_LoginAsCustomer::allow_shopping_assistance')
+ ) {
+ $customerId = $request->getParam('customer_id');
+ $assistanceAllowedParam =
+ (int)$request->getParam('customer')['extension_attributes']['assistance_allowed'];
+ $assistanceAllowed = $this->getLoginAsCustomerAssistanceAllowed->execute((int)$customerId);
+ $assistanceAllowedStatus = $this->resolveStatus($assistanceAllowed);
+ if ($this->isAssistanceAllowedChangeImportant($assistanceAllowedStatus, $assistanceAllowedParam)) {
+ $errorMessages = [
+ MessageInterface::TYPE_ERROR => [
+ __(
+ 'You have no permission to change Opt-In preference.'
+ ),
+ ],
+ ];
+
+ throw new \Magento\Framework\Validator\Exception(
+ null,
+ null,
+ $errorMessages
+ );
+ }
+ }
+ }
+
+ /**
+ * Check if assistance_allowed param is set.
+ *
+ * @param RequestInterface $request
+ * @return bool
+ */
+ private function isSetAssistanceAllowedParam(RequestInterface $request): bool
+ {
+ return is_array($request->getParam('customer'))
+ && isset($request->getParam('customer')['extension_attributes'])
+ && isset($request->getParam('customer')['extension_attributes']['assistance_allowed']);
+ }
+
+ /**
+ * Check if change of assistance_allowed attribute is important.
+ *
+ * E. g. if assistance_allowed is going to be disabled while now it's enabled
+ * or if it's going to be enabled while now it is disabled or not set at all.
+ *
+ * @param int $assistanceAllowed
+ * @param int $assistanceAllowedParam
+ * @return bool
+ */
+ private function isAssistanceAllowedChangeImportant(int $assistanceAllowed, int $assistanceAllowedParam): bool
+ {
+ $result = false;
+ if (($assistanceAllowedParam === IsAssistanceEnabledInterface::DENIED
+ && $assistanceAllowed === IsAssistanceEnabledInterface::ALLOWED)
+ ||
+ ($assistanceAllowedParam === IsAssistanceEnabledInterface::ALLOWED
+ && $assistanceAllowed !== IsAssistanceEnabledInterface::ALLOWED)) {
+ $result = true;
+ }
+
+ return $result;
+ }
+
+ /**
+ * Get integer status value from boolean.
+ *
+ * @param bool $assistanceAllowed
+ * @return int
+ */
+ private function resolveStatus(bool $assistanceAllowed): int
+ {
+ return $assistanceAllowed ? IsAssistanceEnabledInterface::ALLOWED : IsAssistanceEnabledInterface::DENIED;
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php
new file mode 100644
index 0000000000000..619036da8bb22
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerExtractorPlugin.php
@@ -0,0 +1,71 @@
+customerExtensionFactory = $customerExtensionFactory;
+ }
+
+ /**
+ * Add assistance_allowed extension attribute value to Customer instance.
+ *
+ * @param CustomerExtractor $subject
+ * @param callable $proceed
+ * @param string $formCode
+ * @param RequestInterface $request
+ * @param array $attributeValues
+ * @return CustomerInterface
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function aroundExtract(
+ CustomerExtractor $subject,
+ callable $proceed,
+ string $formCode,
+ RequestInterface $request,
+ array $attributeValues = []
+ ) {
+ /** @var CustomerInterface $customer */
+ $customer = $proceed(
+ $formCode,
+ $request,
+ $attributeValues
+ );
+
+ $assistanceAllowedStatus = $request->getParam('assistance_allowed');
+ if (!empty($assistanceAllowedStatus)) {
+ $extensionAttributes = $customer->getExtensionAttributes();
+ if (null === $extensionAttributes) {
+ $extensionAttributes = $this->customerExtensionFactory->create();
+ }
+ $extensionAttributes->setAssistanceAllowed((int)$assistanceAllowedStatus);
+ $customer->setExtensionAttributes($extensionAttributes);
+ }
+
+ return $customer;
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerPlugin.php
new file mode 100644
index 0000000000000..0bc22bf5d8869
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/CustomerPlugin.php
@@ -0,0 +1,57 @@
+setAssistance = $setAssistance;
+ }
+
+ /**
+ * Save assistance_allowed extension attribute for Customer instance.
+ *
+ * @param CustomerRepositoryInterface $subject
+ * @param CustomerInterface $result
+ * @param CustomerInterface $customer
+ * @return CustomerInterface
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function afterSave(
+ CustomerRepositoryInterface $subject,
+ CustomerInterface $result,
+ CustomerInterface $customer
+ ): CustomerInterface {
+ $customerId = (int)$result->getId();
+ $customerExtensionAttributes = $customer->getExtensionAttributes();
+ if ($customerExtensionAttributes && $customerExtensionAttributes->getAssistanceAllowed()) {
+ $isEnabled = (int)$customerExtensionAttributes->getAssistanceAllowed() === IsAssistanceEnabled::ALLOWED;
+ $this->setAssistance->execute($customerId, $isEnabled);
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
new file mode 100644
index 0000000000000..6653340285d32
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/DataProviderWithDefaultAddressesPlugin.php
@@ -0,0 +1,128 @@
+authorization = $authorization;
+ $this->config = $config;
+ $this->getLoginAsCustomerAssistanceAllowed = $getLoginAsCustomerAssistanceAllowed;
+ }
+
+ /**
+ * Add assistance_allowed extension attribute data to Customer form Data Provider.
+ *
+ * @param DataProviderWithDefaultAddresses $subject
+ * @param array $result
+ * @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function afterGetData(
+ DataProviderWithDefaultAddresses $subject,
+ array $result
+ ): array {
+ $isAssistanceAllowed = [];
+
+ foreach ($result as $id => $entityData) {
+ if ($id) {
+ $assistanceAllowedStatus = $this->resolveStatus(
+ $this->getLoginAsCustomerAssistanceAllowed->execute((int)$entityData['customer_id'])
+ );
+ $isAssistanceAllowed[$id]['customer']['extension_attributes']['assistance_allowed'] =
+ (string)$assistanceAllowedStatus;
+ }
+ }
+
+ return array_replace_recursive($result, $isAssistanceAllowed);
+ }
+
+ /**
+ * Modify assistance_allowed extension attribute metadata for Customer form Data Provider.
+ *
+ * @param DataProviderWithDefaultAddresses $subject
+ * @param array $result
+ * @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function afterGetMeta(
+ DataProviderWithDefaultAddresses $subject,
+ array $result
+ ): array {
+ if (!$this->config->isEnabled()) {
+ $assistanceAllowedConfig = ['visible' => false];
+ } elseif (!$this->authorization->isAllowed('Magento_LoginAsCustomer::allow_shopping_assistance')) {
+ $assistanceAllowedConfig = [
+ 'disabled' => true,
+ 'notice' => __('You have no permission to change Opt-In preference.'),
+ ];
+ } else {
+ $assistanceAllowedConfig = [];
+ }
+
+ $config = [
+ 'customer' => [
+ 'children' => [
+ 'extension_attributes.assistance_allowed' => [
+ 'arguments' => [
+ 'data' => [
+ 'config' => $assistanceAllowedConfig,
+ ],
+ ],
+ ],
+ ],
+ ],
+ ];
+
+ return array_replace_recursive($result, $config);
+ }
+
+ /**
+ * Get integer status value from boolean.
+ *
+ * @param bool $assistanceAllowed
+ * @return int
+ */
+ private function resolveStatus(bool $assistanceAllowed): int
+ {
+ return $assistanceAllowed ? IsAssistanceEnabledInterface::ALLOWED : IsAssistanceEnabledInterface::DENIED;
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php b/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php
new file mode 100644
index 0000000000000..45a3eb512e7f8
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/Plugin/LoginAsCustomerButtonDataProviderPlugin.php
@@ -0,0 +1,49 @@
+isAssistanceEnabled = $isAssistanceEnabled;
+ }
+
+ /**
+ * Change Login as Customer button behavior if Customer has not granted permission.
+ *
+ * @param DataProvider $subject
+ * @param array $result
+ * @param int $customerId
+ * @return array
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function afterGetData(DataProvider $subject, array $result, int $customerId): array
+ {
+ if (isset($result['on_click']) && !$this->isAssistanceEnabled->execute($customerId)) {
+ $result['on_click'] = 'window.lacNotAllowedPopup()';
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/README.md b/app/code/Magento/LoginAsCustomerAssistance/README.md
new file mode 100644
index 0000000000000..b43dd6c8db43a
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/README.md
@@ -0,0 +1,3 @@
+# Magento_LoginAsCustomerAssistance module
+
+The Magento_LoginAsCustomerAssistance module provides possibility to enable/disable LoginAsCustomer functionality per Customer.
diff --git a/app/code/Magento/LoginAsCustomerAssistance/ViewModel/ShoppingAssistanceViewModel.php b/app/code/Magento/LoginAsCustomerAssistance/ViewModel/ShoppingAssistanceViewModel.php
new file mode 100644
index 0000000000000..f7e224efaa19a
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/ViewModel/ShoppingAssistanceViewModel.php
@@ -0,0 +1,100 @@
+assistanceConfig = $assistanceConfig;
+ $this->config = $config;
+ $this->isAssistanceEnabled = $isAssistanceEnabled;
+ $this->session = $session;
+ }
+
+ /**
+ * Is Login as Customer functionality enabled.
+ *
+ * @return bool
+ */
+ public function isLoginAsCustomerEnabled(): bool
+ {
+ return $this->config->isEnabled();
+ }
+
+ /**
+ * Is merchant assistance allowed by Customer.
+ *
+ * @return bool
+ */
+ public function isAssistanceAllowed(): bool
+ {
+ $customerId = $this->session->getId();
+
+ return $customerId && $this->isAssistanceEnabled->execute((int)$customerId);
+ }
+
+ /**
+ * Get shopping assistance checkbox title from config.
+ *
+ * @return string
+ */
+ public function getAssistanceCheckboxTitle()
+ {
+ return $this->assistanceConfig->getShoppingAssistanceCheckboxTitle();
+ }
+
+ /**
+ * Get shopping assistance checkbox tooltip text from config.
+ *
+ * @return string
+ */
+ public function getAssistanceCheckboxTooltip()
+ {
+ return $this->assistanceConfig->getShoppingAssistanceCheckboxTooltip();
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/composer.json b/app/code/Magento/LoginAsCustomerAssistance/composer.json
new file mode 100644
index 0000000000000..a02852533b950
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/composer.json
@@ -0,0 +1,27 @@
+{
+ "name": "magento/module-login-as-customer-assistance",
+ "description": "",
+ "require": {
+ "php": "~7.3.0||~7.4.0",
+ "magento/framework": "*",
+ "magento/module-backend": "*",
+ "magento/module-customer": "*",
+ "magento/module-store": "*",
+ "magento/module-login-as-customer": "*",
+ "magento/module-login-as-customer-api": "*"
+ },
+ "suggest": {
+ "magento/module-login-as-customer-admin-ui": "*"
+ },
+ "type": "magento2-module",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [ "registration.php" ],
+ "psr-4": {
+ "Magento\\LoginAsCustomerAssistance\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
new file mode 100644
index 0000000000000..2c16b5a9125df
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/di.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/di.xml
new file mode 100644
index 0000000000000..3071e3038ffcc
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/di.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/system.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..bfdc5519937da
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/adminhtml/system.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/config.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/config.xml
new file mode 100644
index 0000000000000..9b74e4734f00e
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/config.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ Allow remote shopping assistance
+ This allows merchants to "see what you see" and take actions on your behalf in order to provide better assistance.
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema.xml
new file mode 100644
index 0000000000000..deaecc2bfb777
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema_whitelist.json b/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema_whitelist.json
new file mode 100644
index 0000000000000..2c8aa79f3c7b1
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/db_schema_whitelist.json
@@ -0,0 +1,11 @@
+{
+ "login_as_customer_assistance_allowed": {
+ "column": {
+ "customer_id": true
+ },
+ "constraint": {
+ "LOGIN_AS_CSTR_ASSISTANCE_ALLOWED_CSTR_ID_CSTR_ENTT_ENTT_ID": true,
+ "LOGIN_AS_CUSTOMER_ASSISTANCE_ALLOWED_CUSTOMER_ID": true
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/di.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/di.xml
new file mode 100755
index 0000000000000..0cbf3b4d10da6
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/di.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+ -
+ Magento\LoginAsCustomerAssistance\Model\Processor\IsLoginAsCustomerAllowedResolver
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/extension_attributes.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/extension_attributes.xml
new file mode 100644
index 0000000000000..ff47820faadaa
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/extension_attributes.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/frontend/di.xml
new file mode 100644
index 0000000000000..bdb2f82eddd60
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/frontend/di.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/module.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/module.xml
new file mode 100644
index 0000000000000..f443691bcf126
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/module.xml
@@ -0,0 +1,11 @@
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/registration.php b/app/code/Magento/LoginAsCustomerAssistance/registration.php
new file mode 100644
index 0000000000000..c2be7af4bd396
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/registration.php
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+ -
+
-
+
- Magento_LoginAsCustomerAssistance/js/not-allowed-popup
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/templates/not-allowed-popup.phtml b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/templates/not-allowed-popup.phtml
new file mode 100644
index 0000000000000..42e19f9db4931
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/templates/not-allowed-popup.phtml
@@ -0,0 +1,15 @@
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/ui_component/customer_form.xml b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/ui_component/customer_form.xml
new file mode 100644
index 0000000000000..b677becd66064
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/ui_component/customer_form.xml
@@ -0,0 +1,34 @@
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js
new file mode 100644
index 0000000000000..59d8dd4a7ed49
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js
@@ -0,0 +1,55 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'uiComponent',
+ 'Magento_Ui/js/modal/confirm',
+ 'mage/translate'
+], function (Component, confirm, $t) {
+
+ 'use strict';
+
+ return Component.extend({
+ /**
+ * Initialize Component
+ */
+ initialize: function () {
+ var self = this,
+ content;
+
+ this._super();
+
+ content = '';
+
+ /**
+ * Not Allowed popup
+ *
+ * @returns {Boolean}
+ */
+ window.lacNotAllowedPopup = function () {
+ confirm({
+ title: self.title,
+ content: content,
+ modalClass: 'confirm lac-confirm',
+ buttons: [
+ {
+ text: $t('Cancel'),
+ class: 'action-secondary action-dismiss',
+
+ /**
+ * Click handler.
+ */
+ click: function (event) {
+ this.closeModal(event);
+ }
+ }
+ ]
+ });
+
+ return false;
+ };
+ }
+ });
+});
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml
new file mode 100644
index 0000000000000..121d20395e295
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_create.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+ Magento\LoginAsCustomerAssistance\ViewModel\ShoppingAssistanceViewModel
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_edit.xml b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_edit.xml
new file mode 100644
index 0000000000000..15b52cb6cf784
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/layout/customer_account_edit.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
+
+ Magento\LoginAsCustomerAssistance\ViewModel\ShoppingAssistanceViewModel
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml
new file mode 100644
index 0000000000000..7765975863485
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/templates/shopping-assistance.phtml
@@ -0,0 +1,54 @@
+getViewModel();
+?>
+
+
+
+isLoginAsCustomerEnabled()): ?>
+ catalog_category
-
+
-
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
index 97743b458e8d7..2ca58b6020fa7 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -13,6 +13,7 @@
name="product_id"
provider="${ $.parentName }"
sortOrder="110"
+ class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Filters\UsedInProducts"
component="Magento_Catalog/js/components/product-ui-select"
template="ui/grid/filters/elements/ui-select">
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
index 97743b458e8d7..2ca58b6020fa7 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -13,6 +13,7 @@
name="product_id"
provider="${ $.parentName }"
sortOrder="110"
+ class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Filters\UsedInProducts"
component="Magento_Catalog/js/components/product-ui-select"
template="ui/grid/filters/elements/ui-select">
diff --git a/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
new file mode 100644
index 0000000000000..09fea24c8a2a9
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
@@ -0,0 +1,131 @@
+uiComponentFactory = $uiComponentFactory;
+ $this->filterBuilder = $filterBuilder;
+ parent::__construct(
+ $context,
+ $uiComponentFactory,
+ $filterBuilder,
+ $filterModifier,
+ $optionsProvider,
+ $components,
+ $data
+ );
+ $this->bookmarkManagement = $bookmarkManagement;
+ $this->blockRepository = $blockRepository;
+ }
+
+ /**
+ * Prepare component configuration
+ *
+ * @return void
+ */
+ public function prepare()
+ {
+ $options = [];
+ $blockIds = [];
+ $bookmarks = $this->bookmarkManagement->loadByNamespace($this->context->getNameSpace())->getItems();
+ foreach ($bookmarks as $bookmark) {
+ if ($bookmark->getIdentifier() === 'current') {
+ $applied = $bookmark->getConfig()['current']['filters']['applied'];
+ if (isset($applied[$this->getName()])) {
+ $blockIds = $applied[$this->getName()];
+ }
+ }
+ }
+
+ foreach ($blockIds as $id) {
+ $block = $this->blockRepository->getById($id);
+ $options[] = [
+ 'value' => $id,
+ 'label' => $block->getTitle(),
+ 'is_active' => $block->isActive(),
+ 'optgroup' => false
+ ];
+ }
+
+ $this->wrappedComponent = $this->uiComponentFactory->create(
+ $this->getName(),
+ parent::COMPONENT,
+ [
+ 'context' => $this->getContext(),
+ 'options' => $options
+ ]
+ );
+
+ $this->wrappedComponent->prepare();
+ $jsConfig = array_replace_recursive(
+ $this->getJsConfig($this->wrappedComponent),
+ $this->getJsConfig($this)
+ );
+ $this->setData('js_config', $jsConfig);
+
+ $this->setData(
+ 'config',
+ array_replace_recursive(
+ (array)$this->wrappedComponent->getData('config'),
+ (array)$this->getData('config')
+ )
+ );
+
+ $this->applyFilter();
+
+ parent::prepare();
+ }
+}
diff --git a/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
new file mode 100644
index 0000000000000..235a77cdcb8c5
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
@@ -0,0 +1,131 @@
+uiComponentFactory = $uiComponentFactory;
+ $this->filterBuilder = $filterBuilder;
+ parent::__construct(
+ $context,
+ $uiComponentFactory,
+ $filterBuilder,
+ $filterModifier,
+ $optionsProvider,
+ $components,
+ $data
+ );
+ $this->bookmarkManagement = $bookmarkManagement;
+ $this->pageRepository = $pageRepository;
+ }
+
+ /**
+ * Prepare component configuration
+ *
+ * @return void
+ */
+ public function prepare()
+ {
+ $options = [];
+ $pageIds = [];
+ $bookmarks = $this->bookmarkManagement->loadByNamespace($this->context->getNameSpace())->getItems();
+ foreach ($bookmarks as $bookmark) {
+ if ($bookmark->getIdentifier() === 'current') {
+ $applied = $bookmark->getConfig()['current']['filters']['applied'];
+ if (isset($applied[$this->getName()])) {
+ $pageIds = $applied[$this->getName()];
+ }
+ }
+ }
+
+ foreach ($pageIds as $id) {
+ $page = $this->pageRepository->getById($id);
+ $options[] = [
+ 'value' => $id,
+ 'label' => $page->getTitle(),
+ 'is_active' => $page->isActive(),
+ 'optgroup' => false
+ ];
+ }
+
+ $this->wrappedComponent = $this->uiComponentFactory->create(
+ $this->getName(),
+ parent::COMPONENT,
+ [
+ 'context' => $this->getContext(),
+ 'options' => $options
+ ]
+ );
+
+ $this->wrappedComponent->prepare();
+ $pagesFilterjsConfig = array_replace_recursive(
+ $this->getJsConfig($this->wrappedComponent),
+ $this->getJsConfig($this)
+ );
+ $this->setData('js_config', $pagesFilterjsConfig);
+
+ $this->setData(
+ 'config',
+ array_replace_recursive(
+ (array)$this->wrappedComponent->getData('config'),
+ (array)$this->getData('config')
+ )
+ );
+
+ $this->applyFilter();
+
+ parent::prepare();
+ }
+}
diff --git a/app/code/Magento/MediaGalleryCmsUi/composer.json b/app/code/Magento/MediaGalleryCmsUi/composer.json
index 1ecfb9a3c8855..73747a669c051 100644
--- a/app/code/Magento/MediaGalleryCmsUi/composer.json
+++ b/app/code/Magento/MediaGalleryCmsUi/composer.json
@@ -5,7 +5,8 @@
"php": "~7.3.0||~7.4.0",
"magento/framework": "*",
"magento/module-cms": "*",
- "magento/module-backend": "*"
+ "magento/module-backend": "*",
+ "magento/module-ui": "*"
},
"type": "magento2-module",
"license": [
diff --git a/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml
index b06ad0fff1df6..65ed3b7197f83 100644
--- a/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml
@@ -24,7 +24,7 @@
cms_block
-
+
-
diff --git a/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
index 509a7e6a53673..506a6cad5b68e 100644
--- a/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -13,6 +13,7 @@
name="page_id"
provider="${ $.parentName }"
sortOrder="120"
+ class="Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters\UsedInPages"
component="Magento_Ui/js/form/element/ui-select"
template="ui/grid/filters/elements/ui-select">
@@ -37,6 +38,7 @@
name="block_id"
provider="${ $.parentName }"
sortOrder="130"
+ class="Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters\UsedInBlocks"
component="Magento_Ui/js/form/element/ui-select"
template="ui/grid/filters/elements/ui-select">
diff --git a/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
index 509a7e6a53673..506a6cad5b68e 100644
--- a/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -13,6 +13,7 @@
name="page_id"
provider="${ $.parentName }"
sortOrder="120"
+ class="Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters\UsedInPages"
component="Magento_Ui/js/form/element/ui-select"
template="ui/grid/filters/elements/ui-select">
@@ -37,6 +38,7 @@
name="block_id"
provider="${ $.parentName }"
sortOrder="130"
+ class="Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters\UsedInBlocks"
component="Magento_Ui/js/form/element/ui-select"
template="ui/grid/filters/elements/ui-select">
diff --git a/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php b/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php
index 992f77a1df319..339aca84ec68f 100644
--- a/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php
+++ b/app/code/Magento/MediaGallerySynchronization/Console/Command/Synchronize.php
@@ -7,8 +7,6 @@
namespace Magento\MediaGallerySynchronization\Console\Command;
-use Magento\Framework\App\Area;
-use Magento\Framework\App\State;
use Magento\Framework\Console\Cli;
use Magento\MediaGallerySynchronizationApi\Api\SynchronizeInterface;
use Symfony\Component\Console\Command\Command;
@@ -25,21 +23,13 @@ class Synchronize extends Command
*/
private $synchronizeAssets;
- /**
- * @var State $state
- */
- private $state;
-
/**
* @param SynchronizeInterface $synchronizeAssets
- * @param State $state
*/
public function __construct(
- SynchronizeInterface $synchronizeAssets,
- State $state
+ SynchronizeInterface $synchronizeAssets
) {
$this->synchronizeAssets = $synchronizeAssets;
- $this->state = $state;
parent::__construct();
}
@@ -60,10 +50,11 @@ protected function configure()
protected function execute(InputInterface $input, OutputInterface $output)
{
$output->writeln('Synchronizing assets information from media storage to database...');
- $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () {
- $this->synchronizeAssets->execute();
- });
+
+ $this->synchronizeAssets->execute();
+
$output->writeln('Completed assets synchronization.');
+
return Cli::RETURN_SUCCESS;
}
}
diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php
new file mode 100644
index 0000000000000..6c4338c0935dc
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php
@@ -0,0 +1,151 @@
+driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
+ $this->synchronizeFiles = Bootstrap::getObjectManager()->get(SynchronizeFilesInterface::class);
+ $this->getAssetsByPath = Bootstrap::getObjectManager()->get(GetAssetsByPathsInterface::class);
+ $this->getAssetKeywords = Bootstrap::getObjectManager()->get(GetAssetsKeywordsInterface::class);
+ $this->mediaDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
+ ->getDirectoryWrite(DirectoryList::MEDIA);
+ }
+
+ /**
+ * Test for SynchronizeFiles::execute
+ *
+ * @dataProvider filesProvider
+ * @param null|string $file
+ * @param null|string $title
+ * @param null|string $description
+ * @param null|array $keywords
+ * @throws FileSystemException
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ public function testExecute(
+ ?string $file,
+ ?string $title,
+ ?string $description,
+ ?array $keywords
+ ): void {
+ $path = realpath(__DIR__ . '/../_files/' . $file);
+ $modifiableFilePath = $this->mediaDirectory->getAbsolutePath($file);
+ $this->driver->copy(
+ $path,
+ $modifiableFilePath
+ );
+
+ $this->synchronizeFiles->execute([$file]);
+
+ $loadedAssets = $this->getAssetsByPath->execute([$file])[0];
+ $loadedKeywords = $this->getKeywords($loadedAssets) ?: null;
+
+ $this->assertEquals($title, $loadedAssets->getTitle());
+ $this->assertEquals($description, $loadedAssets->getDescription());
+ $this->assertEquals($keywords, $loadedKeywords);
+
+ $this->driver->deleteFile($modifiableFilePath);
+ }
+
+ /**
+ * Data provider for testExecute
+ *
+ * @return array[]
+ */
+ public function filesProvider(): array
+ {
+ return [
+ [
+ '/magento.jpg',
+ 'magento',
+ null,
+ null
+ ],
+ [
+ '/magento_metadata.jpg',
+ 'Title of the magento image',
+ 'Description of the magento image',
+ [
+ 'magento',
+ 'mediagallerymetadata'
+ ]
+ ]
+ ];
+ }
+
+ /**
+ * Key asset keywords
+ *
+ * @param AssetInterface $asset
+ * @return string[]
+ */
+ private function getKeywords(AssetInterface $asset): array
+ {
+ $assetKeywords = $this->getAssetKeywords->execute([$asset->getId()]);
+
+ if (empty($assetKeywords)) {
+ return [];
+ }
+
+ $keywords = current($assetKeywords)->getKeywords();
+
+ return array_map(
+ function (KeywordInterface $keyword) {
+ return $keyword->getKeyword();
+ },
+ $keywords
+ );
+ }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_metadata.jpg b/app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_metadata.jpg
new file mode 100644
index 0000000000000..6dc8cd69e41c1
Binary files /dev/null and b/app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_metadata.jpg differ
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
index b4b6713f47065..df13250eacb5f 100644
--- a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
@@ -137,7 +137,7 @@ public function execute()
if (!empty($assets)) {
foreach ($assets as $asset) {
$responseContent['options'][] = [
- 'value' => $asset->getId(),
+ 'value' => (string) $asset->getId(),
'label' => $asset->getTitle(),
'path' => $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $asset->getPath())
];
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php
deleted file mode 100644
index 7c3eccfea521f..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php
+++ /dev/null
@@ -1,59 +0,0 @@
-dateTime = $dateTime;
- }
-
- /**
- * Provide asset created at date time
- *
- * @param AssetInterface $asset
- * @return array
- * @throws \Exception
- */
- public function execute(AssetInterface $asset): array
- {
- return [
- 'title' => __('Created'),
- 'value' => $this->formatDate($asset->getCreatedAt())
- ];
- }
-
- /**
- * Format date to standard format
- *
- * @param string $date
- * @return string
- * @throws \Exception
- */
- private function formatDate(string $date): string
- {
- return $this->dateTime->formatDate($date, \IntlDateFormatter::SHORT, true);
- }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Height.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Height.php
deleted file mode 100644
index b2b0f389f6b9a..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Height.php
+++ /dev/null
@@ -1,33 +0,0 @@
- __('Height'),
- 'value' => sprintf('%spx', $asset->getHeight())
- ];
- }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Size.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Size.php
deleted file mode 100644
index 55841cc5abd3f..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Size.php
+++ /dev/null
@@ -1,49 +0,0 @@
- __('Size'),
- 'value' => $this->formatImageSize($asset->getSize())
- ];
- }
-
- /**
- * Format image size
- *
- * @param int $imageSize
- *
- * @return string
- */
- private function formatImageSize(int $imageSize): string
- {
- if ($imageSize === 0) {
- return '';
- }
-
- return sprintf('%sKb', $imageSize / 1000);
- }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Type.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Type.php
deleted file mode 100644
index 5b47616398ef7..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Type.php
+++ /dev/null
@@ -1,59 +0,0 @@
-types = $types;
- }
-
- /**
- * Provide asset type
- *
- * @param AssetInterface $asset
- * @return array
- * @throws IntegrationException
- */
- public function execute(AssetInterface $asset): array
- {
- return [
- 'title' => __('Type'),
- 'value' => $this->getImageTypeByContentType($asset->getContentType()),
- ];
- }
-
- /**
- * Return image type by content type
- *
- * @param string $contentType
- * @return string
- */
- private function getImageTypeByContentType(string $contentType): string
- {
- $type = current(explode('/', $contentType));
-
- return isset($this->types[$type]) ? $this->types[$type] : 'Asset';
- }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php
deleted file mode 100644
index 2f50bd9a72208..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php
+++ /dev/null
@@ -1,59 +0,0 @@
-dateTime = $dateTime;
- }
-
- /**
- * Provide asset updated at date time
- *
- * @param AssetInterface $asset
- * @return array
- * @throws \Exception
- */
- public function execute(AssetInterface $asset): array
- {
- return [
- 'title' => __('Modified'),
- 'value' => $this->formatDate($asset->getUpdatedAt())
- ];
- }
-
- /**
- * Format date to standard format
- *
- * @param string $date
- * @return string
- * @throws \Exception
- */
- private function formatDate(string $date): string
- {
- return $this->dateTime->formatDate($date, \IntlDateFormatter::SHORT, true);
- }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php
deleted file mode 100644
index ca3883d5c937c..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php
+++ /dev/null
@@ -1,113 +0,0 @@
-getContent = $getContent;
- $this->url = $url;
- $this->contentTypes = $contentTypes;
- }
-
- /**
- * Provide information on which content asset is used in
- *
- * @param AssetInterface $asset
- * @return array
- * @throws IntegrationException
- */
- public function execute(AssetInterface $asset): array
- {
- return [
- 'title' => __('Used In'),
- 'value' => $this->getUsedIn($asset->getId())
- ];
- }
-
- /**
- * Retrieve assets used in the Content
- *
- * @param int $assetId
- * @return array
- * @throws IntegrationException
- */
- private function getUsedIn(int $assetId): array
- {
- $details = [];
-
- foreach ($this->getUsedInCounts($assetId) as $type => $number) {
- $details[$type] = $this->contentTypes[$type] ?? ['name' => $type, 'link' => null];
- $details[$type]['number'] = $number;
- $details[$type]['link'] = $details[$type]['link'] ? $this->url->getUrl($details[$type]['link']) : null;
- }
-
- return array_values($details);
- }
-
- /**
- * Get used in counts per type
- *
- * @param int $assetId
- * @return int[]
- * @throws IntegrationException
- */
- private function getUsedInCounts(int $assetId): array
- {
- $usedIn = [];
- $entityIds = [];
-
- $contentIdentities = $this->getContent->execute([$assetId]);
-
- foreach ($contentIdentities as $contentIdentity) {
- $entityId = $contentIdentity->getEntityId();
- $type = $contentIdentity->getEntityType();
-
- if (!isset($entityIds[$type])) {
- $usedIn[$type] = 1;
- } elseif ($entityIds[$type]['entity_id'] !== $entityId) {
- ++$usedIn[$type];
- }
- $entityIds[$type]['entity_id'] = $entityId;
- }
- return $usedIn;
- }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Width.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Width.php
deleted file mode 100644
index 64e9cf8ad1a8f..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Width.php
+++ /dev/null
@@ -1,33 +0,0 @@
- __('Width'),
- 'value' => sprintf('%spx', $asset->getWidth())
- ];
- }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderInterface.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderInterface.php
deleted file mode 100644
index 92375adfdd4f2..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-detailsProviders = $detailsProviders;
- }
-
- /**
- * Get a piece of asset details
- *
- * @param AssetInterface $asset
- * @return array
- */
- public function execute(AssetInterface $asset): array
- {
- $details = [];
- foreach ($this->detailsProviders as $detailsProvider) {
- if ($detailsProvider instanceof AssetDetailsProviderInterface) {
- $details[] = $detailsProvider->execute($asset);
- }
- }
- return $details;
- }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php b/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
new file mode 100644
index 0000000000000..88bd5cf96e534
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
@@ -0,0 +1,102 @@
+dateTime = $dateTime;
+ $this->getAssetUsageDetails = $getAssetUsageDetails;
+ }
+
+ /**
+ * Get a piece of asset details
+ *
+ * @param AssetInterface $asset
+ * @return array
+ */
+ public function execute(AssetInterface $asset): array
+ {
+ $details = [
+ [
+ 'title' => __('Type'),
+ 'value' => __('Image'),
+ ],
+ [
+ 'title' => __('Created'),
+ 'value' => $this->formatDate($asset->getCreatedAt())
+ ],
+ [
+ 'title' => __('Modified'),
+ 'value' => $this->formatDate($asset->getUpdatedAt())
+ ],
+ [
+ 'title' => __('Width'),
+ 'value' => sprintf('%spx', $asset->getWidth())
+ ],
+ [
+ 'title' => __('Height'),
+ 'value' => sprintf('%spx', $asset->getHeight())
+ ],
+ [
+ 'title' => __('Size'),
+ 'value' => $this->formatSize($asset->getSize())
+ ],
+ [
+ 'title' => __('Used In'),
+ 'value' => $this->getAssetUsageDetails->execute($asset->getId())
+ ]
+ ];
+ return $details;
+ }
+
+ /**
+ * Format image size
+ *
+ * @param int $size
+ * @return string
+ */
+ private function formatSize(int $size): string
+ {
+ return $size === 0 ? '' : sprintf('%.2f KB', $size / 1024);
+ }
+
+ /**
+ * Format date to standard format
+ *
+ * @param string $date
+ * @return string
+ */
+ private function formatDate(string $date): string
+ {
+ return $this->dateTime->formatDate($date, \IntlDateFormatter::SHORT, true);
+ }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php b/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php
new file mode 100644
index 0000000000000..1dd8b736a9c90
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php
@@ -0,0 +1,118 @@
+getContent = $getContent;
+ $this->url = $url;
+ $this->contentTypes = $contentTypes;
+ }
+
+ /**
+ * Provide information on which content asset is used in
+ *
+ * @param int $id
+ * @return array
+ * @throws IntegrationException
+ */
+ public function execute(int $id): array
+ {
+ $details = [];
+
+ foreach ($this->getUsageByEntities($id) as $type => $entities) {
+ $details[] = [
+ 'name' => $this->getName($type),
+ 'number' => count($entities),
+ 'link' => $this->getLinkUrl($type)
+ ];
+ }
+
+ return $details;
+ }
+
+ /**
+ * Retrieve the type name from content types configuration
+ *
+ * @param string $type
+ * @return string
+ */
+ private function getName(string $type): string
+ {
+ if (isset($this->contentTypes[$type]) && !empty($this->contentTypes[$type]['name'])) {
+ return $this->contentTypes[$type]['name'];
+ }
+ return $type;
+ }
+
+ /**
+ * Retrieve the type link from content types configuration
+ *
+ * @param string $type
+ * @return string|null
+ */
+ private function getLinkUrl(string $type): ?string
+ {
+ if (isset($this->contentTypes[$type]) && !empty($this->contentTypes[$type]['link'])) {
+ return $this->url->getUrl($this->contentTypes[$type]['link']);
+ }
+ return null;
+ }
+
+ /**
+ * Get used in counts per type
+ *
+ * @param int $assetId
+ * @return int[]
+ * @throws IntegrationException
+ */
+ private function getUsageByEntities(int $assetId): array
+ {
+ $usage = [];
+
+ foreach ($this->getContent->execute([$assetId]) as $contentIdentity) {
+ $id = $contentIdentity->getEntityId();
+ $type = $contentIdentity->getEntityType();
+ $usage[$type][$id] = isset($usage[$type][$id]) ? $usage[$type][$id]++ : 0;
+ }
+
+ return $usage;
+ }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php b/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php
index b870082ea2aa1..f6972637b3610 100644
--- a/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php
+++ b/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php
@@ -44,25 +44,25 @@ class GetDetailsByAssetId
private $getAssetKeywords;
/**
- * @var AssetDetailsProviderPool
+ * @var GetAssetDetails
*/
- private $detailsProviderPool;
+ private $getAssetDetails;
/**
- * @param AssetDetailsProviderPool $detailsProviderPool
+ * @param GetAssetDetails $getAssetDetails
* @param GetAssetsByIdsInterface $getAssetById
* @param StoreManagerInterface $storeManager
* @param SourceIconProvider $sourceIconProvider
* @param GetAssetsKeywordsInterface $getAssetKeywords
*/
public function __construct(
- AssetDetailsProviderPool $detailsProviderPool,
+ GetAssetDetails $getAssetDetails,
GetAssetsByIdsInterface $getAssetById,
StoreManagerInterface $storeManager,
SourceIconProvider $sourceIconProvider,
GetAssetsKeywordsInterface $getAssetKeywords
) {
- $this->detailsProviderPool = $detailsProviderPool;
+ $this->getAssetDetails = $getAssetDetails;
$this->getAssetsById = $getAssetById;
$this->storeManager = $storeManager;
$this->sourceIconProvider = $sourceIconProvider;
@@ -89,7 +89,7 @@ public function execute(array $assetIds): array
'path' => $asset->getPath(),
'description' => $asset->getDescription(),
'id' => $asset->getId(),
- 'details' => $this->detailsProviderPool->execute($asset),
+ 'details' => $this->getAssetDetails->execute($asset),
'size' => $asset->getSize(),
'tags' => $this->getKeywords($asset),
'source' => $asset->getSource() ?
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
index 4b0375088509b..5e5c89637c6a1 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
@@ -13,7 +13,7 @@
Activate massaction mode by click on Delete Selected..
-
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
index a40a70c5f160c..07f2dc23530e1 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
@@ -11,6 +11,7 @@
media
-
-
-
- - Image
-
-
-
-
-
-
- - Magento\MediaGalleryUi\Model\AssetDetailsProvider\Type
- - Magento\MediaGalleryUi\Model\AssetDetailsProvider\CreatedAt
- - Magento\MediaGalleryUi\Model\AssetDetailsProvider\UpdatedAt
- - Magento\MediaGalleryUi\Model\AssetDetailsProvider\Width
- - Magento\MediaGalleryUi\Model\AssetDetailsProvider\Height
- - Magento\MediaGalleryUi\Model\AssetDetailsProvider\Size
- - Magento\MediaGalleryUi\Model\AssetDetailsProvider\UsedIn
-
-
-
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
index 671a82dce3f58..fc8bd49126d8e 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
@@ -29,7 +29,8 @@
}
}
- .media-gallery-asset-ui-select-filter {
+ .media-gallery-asset-ui-select-filter,
+ .edit-image-details {
.admin__action-multiselect-crumb {
max-width: 70%;
@@ -47,7 +48,10 @@
position: absolute;
text-overflow: ellipsis;
}
+ }
+ .media-gallery-asset-ui-select-filter,
+ .edit-image-details {
.admin__action-multiselect-item-path {
float: right;
max-height: 70px;
@@ -307,7 +311,7 @@
}
}
- .adobe-stock-icon {
+ .media-gallery-source-icon {
margin-bottom: -6px;
width: 29px;
}
@@ -366,7 +370,7 @@
}
.image-type {
- .adobe-stock-icon {
+ .media-gallery-source-icon {
margin-bottom: -6px;
width: 29px;
}
@@ -412,12 +416,14 @@
& > * {
float: left;
+ margin-left: -1px;
width: 50%;
}
.value {
display: inline;
float: right;
+ margin-left: 1px;
}
.title {
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js
index e7c05573a4f11..bf852d0ddae68 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image.js
@@ -103,6 +103,7 @@ define([
*/
updateSelected: function () {
this.selected({});
+ this.hideAddSelectedAndDeleteButon();
},
/**
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js
index a49303669edc8..ddc5af0ab6296 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactionView.js
@@ -7,33 +7,23 @@ define([
'jquery',
'uiComponent',
'mage/translate',
- 'text!Magento_MediaGalleryUi/template/grid/massactions/cancelButton.html'
-], function ($, Component, $t, cancelMassActionButton) {
+ 'text!Magento_MediaGalleryUi/template/grid/massactions/massactionButtons.html'
+], function ($, Component, $t, massactionButtons) {
'use strict';
return Component.extend({
defaults: {
- pageActionsSelector: '.page-actions-buttons',
gridSelector: '[data-id="media-gallery-masonry-grid"]',
- originDeleteSelector: null,
- originCancelEvent: null,
- cancelMassactionButton: cancelMassActionButton,
- isCancelButtonInserted: false,
- deleteButtonSelector: '#delete_massaction',
- addSelectedButtonSelector: '#add_selected',
- cancelMassactionButtonSelector: '#cancel',
standAloneTitle: 'Manage Gallery',
slidePanelTitle: 'Media Gallery',
defaultTitle: null,
- contextButtonSelector: '.three-dots',
- buttonsIds: [
- '#delete_folder',
- '#create_folder',
- '#upload_image',
- '#search_adobe_stock',
- '.three-dots',
- '#add_selected'
- ],
+ are: null,
+ standAloneArea: 'standalone',
+ slidepanelArea: 'slidepanel',
+ massactionButtonsSelector: '.massaction-buttons',
+ buttonsSelectorStandalone: '.page-actions-buttons',
+ buttonsSelectorSlidePanel: '.page-actions.floating-header',
+ buttons: '.page-main-actions :button',
massactionModeTitle: $t('Select Images to Delete')
},
@@ -62,7 +52,6 @@ define([
* Hide or show buttons per active mode.
*/
switchButtons: function () {
-
if (this.massActionMode()) {
this.activateMassactionButtonView();
} else {
@@ -74,58 +63,24 @@ define([
* Sets buttons to default regular -mode view.
*/
revertButtonsToDefaultView: function () {
- $(this.deleteButtonSelector).replaceWith(this.originDeleteSelector);
-
- if (!this.isCancelButtonInserted) {
- $('#cancel_massaction').replaceWith(this.originCancelEvent);
- } else {
- $(this.cancelMassactionButtonSelector).addClass('no-display');
- $('#cancel_massaction').remove();
- }
-
- $.each(this.buttonsIds, function (key, value) {
- $(value).removeClass('no-display');
- });
-
- $(this.addSelectedButtonSelector).addClass('no-display');
- $(this.deleteButtonSelector)
- .addClass('media-gallery-actions-buttons')
- .removeClass('primary');
+ $(this.buttons).removeClass('no-display');
+ $(this.massactionButtonsSelector).remove();
},
/**
* Activate mass action buttons view
*/
activateMassactionButtonView: function () {
- this.originDeleteSelector = $(this.deleteButtonSelector).clone();
- $(this.originDeleteSelector).click(function () {
- $(window).trigger('massAction.MediaGallery');
- });
- this.originCancelEvent = $('#cancel').clone(true, true);
+ var buttonsContainer;
- $.each(this.buttonsIds, function (key, value) {
- $(value).addClass('no-display');
- });
+ $(this.buttons).addClass('no-display');
- $(this.deleteButtonSelector)
- .removeClass('media-gallery-actions-buttons')
- .text($t('Delete Selected'))
- .addClass('primary');
-
- if (!$(this.cancelMassactionButtonSelector).length) {
- $(this.pageActionsSelector).append(this.cancelMassactionButton);
- this.isCancelButtonInserted = true;
- } else {
- $(this.cancelMassactionButtonSelector).replaceWith(this.cancelMassactionButton);
- }
- $('#cancel_massaction').on('click', function () {
- $(window).trigger('terminateMassAction.MediaGallery');
- }).applyBindings();
-
- $(this.deleteButtonSelector).off('click').on('click', function () {
- $(this.deleteButtonSelector).trigger('massDelete');
- }.bind(this));
+ buttonsContainer = this.area === this.standAloneArea ?
+ this.buttonsSelectorStandalone :
+ this.buttonsSelectorSlidePanel;
+ $(buttonsContainer).append(massactionButtons);
+ $(this.massactionButtonsSelector).applyBindings();
},
/**
@@ -133,7 +88,15 @@ define([
*/
changePageTitle: function () {
var title = $('h1:contains(' + this.standAloneTitle + ')'),
- titleSelector = title.length === 1 ? title : $('h1:contains(' + this.slidePanelTitle + ')');
+ titleSelector;
+
+ if (title.length === 1) {
+ titleSelector = title;
+ this.area = this.standAloneArea;
+ } else {
+ titleSelector = $('h1:contains(' + this.slidePanelTitle + ')');
+ this.area = this.slidepanelArea;
+ }
if (this.massActionMode()) {
this.defaultTitle = titleSelector.text();
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
index 8114305a3b29c..4f09854005f23 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
@@ -16,6 +16,7 @@ define([
return Component.extend({
defaults: {
+ deleteButtonSelector: '#delete_selected_massaction',
deleteImagesSelector: '#delete_massaction',
mediaGalleryImageDetailsName: 'mediaGalleryImageDetails',
modules: {
@@ -86,6 +87,7 @@ define([
this.massActionMode(false);
this.switchMode();
+ this.imageModel().updateSelected();
}.bind(this));
},
@@ -124,7 +126,7 @@ define([
*/
handleDeleteAction: function () {
if (this.massActionMode()) {
- $(this.massactionView().deleteButtonSelector).on('massDelete', function () {
+ $(this.deleteButtonSelector).on('massDelete.MediaGallery', function () {
if (this.getSelectedCount() < 1) {
uiAlert({
content: $t('You need to select at least one image')
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
index d0d37d49329e0..db42f155501c3 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-details.js
@@ -135,6 +135,16 @@ define([
return _.isArray(value);
},
+ /**
+ * Is value not empty
+ *
+ * @param {*} value
+ * @returns {Boolean}
+ */
+ notEmpty: function (value) {
+ return value.length > 0;
+ },
+
/**
* Get name and number text for used in link
*
@@ -151,7 +161,7 @@ define([
* @param {String} link
*/
getFilterUrl: function (link) {
- return link + '?filters[asset_id]=' + this.image().id;
+ return link + '?filters[asset_id]=[' + this.image().id + ']';
},
/**
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
index 4a8350231a0fd..3b88c58201be7 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/columns/image.html
@@ -29,7 +29,7 @@
"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().lastChild.innerHTML=e.encode(t.value)}),e._super()},repaint:function(){var t,e;t=this.getEl().style,e=this._layoutRect,t.left=e.x+"px",t.top=e.y+"px",t.zIndex=131070}}),ye=ce.extend({init:function(i){var r=this;r._super(i),i=r.settings,r.canFocus=!0,i.tooltip&&!1!==ye.tooltips&&(r.on("mouseenter",function(t){var e=r.tooltip().moveTo(-65535);if(t.control===r){var n=e.text(i.tooltip).show().testMoveRel(r.getEl(),["bc-tc","bc-tl","bc-tr"]);e.classes.toggle("tooltip-n","bc-tc"===n),e.classes.toggle("tooltip-nw","bc-tl"===n),e.classes.toggle("tooltip-ne","bc-tr"===n),e.moveRel(r.getEl(),n)}else e.hide()}),r.on("mouseleave mousedown click",function(){r.tooltip().remove(),r._tooltip=null})),r.aria("label",i.ariaLabel||i.tooltip)},tooltip:function(){return this._tooltip||(this._tooltip=new ve({type:"tooltip"}),ie.inheritUiContainer(this,this._tooltip),this._tooltip.renderTo()),this._tooltip},postRender:function(){var t=this,e=t.settings;t._super(),t.parent()||!e.width&&!e.height||(t.initLayoutRect(),t.repaint()),e.autofocus&&t.focus()},bindStates:function(){var e=this;function n(t){e.aria("disabled",t),e.classes.toggle("disabled",t)}function i(t){e.aria("pressed",t),e.classes.toggle("active",t)}return e.state.on("change:disabled",function(t){n(t.value)}),e.state.on("change:active",function(t){i(t.value)}),e.state.get("disabled")&&n(!0),e.state.get("active")&&i(!0),e._super()},remove:function(){this._super(),this._tooltip&&(this._tooltip.remove(),this._tooltip=null)}}),be=ye.extend({Defaults:{value:0},init:function(t){this._super(t),this.classes.add("progress"),this.settings.filter||(this.settings.filter=function(t){return Math.round(t)})},renderHtml:function(){var t=this._id,e=this.classPrefix;return'
renderEventListenerAsTag(
'onload',
@@ -31,40 +33,45 @@
renderEventListenerAsTag(
'onsubmit',
- "productConfigure.onConfirmBtn();event.preventDefault()",
+ 'productConfigure.onConfirmBtn();event.preventDefault()',
'.product_composite_configure_form:last-of-type'
) ?>
onlyMethods(['create'])
->getMock();
- $this->attrSetColFactory = $this->getMockBuilder(
- \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory::class
- )->addMethods(['setEntityTypeFilter'])
+ $this->attrSetColFactory = $this->getMockBuilder(AttributeSetCollectionFactory::class)
+ ->disableOriginalConstructor()
+ ->addMethods(['setEntityTypeFilter'])
->onlyMethods(['create'])
->getMock();
- $this->categoryColFactory = $this->getMockBuilder(
- \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory::class
- )->addMethods(['addNameToResult'])
+ $this->categoryColFactory = $this->getMockBuilder(CategoryCollectionFactory::class)
+ ->disableOriginalConstructor()->addMethods(['addNameToResult'])
->onlyMethods(['create'])
->getMock();
diff --git a/app/code/Magento/CatalogInventory/Model/StockState.php b/app/code/Magento/CatalogInventory/Model/StockState.php
index ac6dc16366798..e28a2096942d4 100644
--- a/app/code/Magento/CatalogInventory/Model/StockState.php
+++ b/app/code/Magento/CatalogInventory/Model/StockState.php
@@ -9,8 +9,11 @@
use Magento\CatalogInventory\Api\StockStateInterface;
use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
use Magento\CatalogInventory\Model\Spi\StockStateProviderInterface;
+use Magento\Framework\DataObject;
/**
+ * Provides functionality for stock state information
+ *
* Interface StockState
*/
class StockState implements StockStateInterface
@@ -31,6 +34,8 @@ class StockState implements StockStateInterface
protected $stockConfiguration;
/**
+ * StockState constructor
+ *
* @param StockStateProviderInterface $stockStateProvider
* @param StockRegistryProviderInterface $stockRegistryProvider
* @param StockConfigurationInterface $stockConfiguration
@@ -46,30 +51,32 @@ public function __construct(
}
/**
+ * Verify stock by product id
+ *
* @param int $productId
* @param int $scopeId
* @return bool
*/
public function verifyStock($productId, $scopeId = null)
{
- // if ($scopeId === null) {
- $scopeId = $this->stockConfiguration->getDefaultScopeId();
- // }
+ $scopeId = $this->stockConfiguration->getDefaultScopeId();
$stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
return $this->stockStateProvider->verifyStock($stockItem);
}
/**
+ * Verify notification by product id
+ *
* @param int $productId
* @param int $scopeId
* @return bool
*/
public function verifyNotification($productId, $scopeId = null)
{
- // if ($scopeId === null) {
- $scopeId = $this->stockConfiguration->getDefaultScopeId();
- // }
+ $scopeId = $this->stockConfiguration->getDefaultScopeId();
$stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
return $this->stockStateProvider->verifyNotification($stockItem);
}
@@ -84,16 +91,14 @@ public function verifyNotification($productId, $scopeId = null)
*/
public function checkQty($productId, $qty, $scopeId = null)
{
- // if ($scopeId === null) {
- $scopeId = $this->stockConfiguration->getDefaultScopeId();
- // }
+ $scopeId = $this->stockConfiguration->getDefaultScopeId();
$stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
return $this->stockStateProvider->checkQty($stockItem, $qty);
}
/**
- * Returns suggested qty that satisfies qty increments and minQty/maxQty/minSaleQty/maxSaleQty conditions
- * or original qty if such value does not exist
+ * Returns suggested qty that satisfies qty increments/minQty/maxQty/minSaleQty/maxSaleQty else returns original qty
*
* @param int $productId
* @param float $qty
@@ -102,10 +107,9 @@ public function checkQty($productId, $qty, $scopeId = null)
*/
public function suggestQty($productId, $qty, $scopeId = null)
{
- // if ($scopeId === null) {
- $scopeId = $this->stockConfiguration->getDefaultScopeId();
- // }
+ $scopeId = $this->stockConfiguration->getDefaultScopeId();
$stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
return $this->stockStateProvider->suggestQty($stockItem, $qty);
}
@@ -118,29 +122,31 @@ public function suggestQty($productId, $qty, $scopeId = null)
*/
public function getStockQty($productId, $scopeId = null)
{
- // if ($scopeId === null) {
- $scopeId = $this->stockConfiguration->getDefaultScopeId();
- // }
+ $scopeId = $this->stockConfiguration->getDefaultScopeId();
$stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
return $this->stockStateProvider->getStockQty($stockItem);
}
/**
+ * Check qty increments by product id
+ *
* @param int $productId
* @param float $qty
* @param int $websiteId
- * @return \Magento\Framework\DataObject
+ * @return DataObject
*/
public function checkQtyIncrements($productId, $qty, $websiteId = null)
{
- // if ($websiteId === null) {
- $websiteId = $this->stockConfiguration->getDefaultScopeId();
- // }
+ $websiteId = $this->stockConfiguration->getDefaultScopeId();
$stockItem = $this->stockRegistryProvider->getStockItem($productId, $websiteId);
+
return $this->stockStateProvider->checkQtyIncrements($stockItem, $qty);
}
/**
+ * Check quote item qty
+ *
* @param int $productId
* @param float $itemQty
* @param float $qtyToCheck
@@ -150,10 +156,9 @@ public function checkQtyIncrements($productId, $qty, $websiteId = null)
*/
public function checkQuoteItemQty($productId, $itemQty, $qtyToCheck, $origQty, $scopeId = null)
{
- // if ($scopeId === null) {
- $scopeId = $this->stockConfiguration->getDefaultScopeId();
- // }
+ $scopeId = $this->stockConfiguration->getDefaultScopeId();
$stockItem = $this->stockRegistryProvider->getStockItem($productId, $scopeId);
+
return $this->stockStateProvider->checkQuoteItemQty($stockItem, $itemQty, $qtyToCheck, $origQty);
}
}
diff --git a/app/code/Magento/CatalogInventory/etc/webapi.xml b/app/code/Magento/CatalogInventory/etc/webapi.xml
index c172b9c971500..af9c70bf59c36 100644
--- a/app/code/Magento/CatalogInventory/etc/webapi.xml
+++ b/app/code/Magento/CatalogInventory/etc/webapi.xml
@@ -10,25 +10,25 @@
-
-
-
-
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
index 2555aa876b71e..68f6b1b2753c0 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/region-updater.js
@@ -56,6 +56,9 @@ define([
if (this.options.isMultipleCountriesAllowed) {
this.element.parents('div.field').show();
this.element.on('change', $.proxy(function (e) {
+ // clear region inputs on country change
+ $(this.options.regionListId).val('');
+ $(this.options.regionInputId).val('');
this._updateRegion($(e.target).val());
}, this));
@@ -165,9 +168,6 @@ define([
this._clearError();
this._checkRegionRequired(country);
- $(regionList).find('option:selected').removeAttr('selected');
- regionInput.val('');
-
// Populate state/province dropdown list if available or use input box
if (this.options.regionJson[country]) {
this._removeSelectOptions(regionList);
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
index 131745d840528..053b15b4ad343 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html
@@ -44,11 +44,11 @@
-
+
-
-
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
index 46a968959407f..ea5e90383511c 100644
--- a/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
@@ -18,7 +18,7 @@
0
hidden
-
+
cms/wysiwyg/editor
0
Magento_Tinymce3/tinymce3Adapter
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
index a6f4e7780d096..725d050554f2d 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
@@ -17,7 +17,8 @@
-
+
+ TinyMCE3 is no longer supported
+
' . $field->toHtml() . ' ';
} else {
$elements .= $field->toHtml();
+ $styleTag = $this->addVisibilityTag($field);
+ $elements .= $styleTag;
}
}
@@ -168,11 +170,13 @@ protected function _getFrontendClass($element)
*/
protected function _getHeaderTitleHtml($element)
{
+ $styleTag = $this->addVisibilityTag($element);
return '' . $element->getLegend() . '' .
+ $styleTag .
/* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
'onclick',
'event.preventDefault();' .
@@ -270,10 +274,70 @@ protected function _isCollapseState($element)
return true;
}
+ if ($this->isCollapseStateByDependentField($element)) {
+ return false;
+ }
+
$extra = $this->_authSession->getUser()->getExtra();
+
if (isset($extra['configState'][$element->getId()])) {
return $extra['configState'][$element->getId()];
}
return $this->isCollapsedDefault;
}
+
+ /**
+ * Check if element should be collapsed by dependent field value.
+ *
+ * @param AbstractElement $element
+ * @return bool
+ */
+ private function isCollapseStateByDependentField(AbstractElement $element): bool
+ {
+ if (!empty($element->getGroup()['depends']['fields'])) {
+ foreach ($element->getGroup()['depends']['fields'] as $dependFieldData) {
+ if (is_array($dependFieldData) && isset($dependFieldData['value'], $dependFieldData['id'])) {
+ $fieldSetForm = $this->getForm();
+ $dependentFieldConfigValue = $this->_scopeConfig->getValue(
+ $dependFieldData['id'],
+ $fieldSetForm->getScope(),
+ $fieldSetForm->getScopeCode()
+ );
+
+ if ($dependFieldData['value'] !== $dependentFieldConfigValue) {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * If element or it's parent depends on other element we hide it during page load.
+ *
+ * @param AbstractElement $field
+ * @return string
+ */
+ private function addVisibilityTag(AbstractElement $field): string
+ {
+ $elementId = '';
+ $styleTag = '';
+
+ if (!empty($field->getFieldConfig()['depends']['fields'])) {
+ $elementId = '#row_' . $field->getHtmlId();
+ } elseif (!empty($field->getGroup()['depends']['fields'])) {
+ $elementId = '#' . $field->getHtmlId() . '-head';
+ }
+
+ if (!empty($elementId)) {
+ $styleTag .= $this->secureRenderer->renderStyleAsTag(
+ 'display: none;',
+ $elementId
+ );
+ }
+
+ return $styleTag;
+ }
}
diff --git a/app/code/Magento/Config/Setup/Patch/Data/UnsetTinymce3.php b/app/code/Magento/Config/Setup/Patch/Data/UnsetTinymce3.php
new file mode 100644
index 0000000000000..115b3baeded8d
--- /dev/null
+++ b/app/code/Magento/Config/Setup/Patch/Data/UnsetTinymce3.php
@@ -0,0 +1,92 @@
+moduleDataSetup = $moduleDataSetup;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function apply()
+ {
+ try {
+ $connection = $this->moduleDataSetup->getConnection();
+ $table = $this->moduleDataSetup->getTable('core_config_data');
+ $select = $connection
+ ->select()
+ ->from(
+ $table,
+ ['value']
+ )
+ ->where('path = ?', 'cms/wysiwyg/editor');
+
+ if (strpos($connection->fetchOne($select), 'Tinymce3/tinymce3Adapter') !== false) {
+ $row = [
+ 'value' => 'mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter'
+ ];
+ $where = $connection->quoteInto(
+ 'path = ?',
+ 'cms/wysiwyg/editor'
+ );
+ $connection->update(
+ $table,
+ $row,
+ $where
+ );
+ }
+ return $this;
+ } catch (\Exception $e) {
+ return $this;
+ }
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public static function getDependencies()
+ {
+ return [];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public static function getVersion()
+ {
+ return '2.3.6';
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAliases()
+ {
+ return [];
+ }
+}
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitchToTinyMCE3ActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitchToTinyMCE3ActionGroup.xml
index b725610b7b2ee..837402005fecf 100644
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitchToTinyMCE3ActionGroup.xml
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/SwitchToTinyMCE3ActionGroup.xml
@@ -8,7 +8,7 @@
-
+
Goes to the 'Configuration' page for 'Content Management'. Sets 'WYSIWYG Editor' to 'TinyMCE 3'. Clicks on the Save button. PLEASE NOTE: The value is Hardcoded.
diff --git a/app/code/Magento/Customer/Block/Account/Navigation.php b/app/code/Magento/Customer/Block/Account/Navigation.php
index dcbd637ac360e..9a8aa698eaa47 100644
--- a/app/code/Magento/Customer/Block/Account/Navigation.php
+++ b/app/code/Magento/Customer/Block/Account/Navigation.php
@@ -47,6 +47,6 @@ public function getLinks()
*/
private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink): int
{
- return $firstLink->getSortOrder() <=> $secondLink->getSortOrder();
+ return $secondLink->getSortOrder() <=> $firstLink->getSortOrder();
}
}
diff --git a/app/code/Magento/Customer/Model/Options.php b/app/code/Magento/Customer/Model/Options.php
index c230353f2a284..4c9b9f97ad43a 100644
--- a/app/code/Magento/Customer/Model/Options.php
+++ b/app/code/Magento/Customer/Model/Options.php
@@ -97,14 +97,15 @@ private function prepareNamePrefixSuffixOptions($options, $isOptional = false)
if (empty($options)) {
return false;
}
+
$result = [];
- $options = array_filter(explode(';', $options));
+ $options = explode(';', $options);
foreach ($options as $value) {
- $value = $this->escaper->escapeHtml(trim($value));
- $result[$value] = $value;
+ $result[] = $this->escaper->escapeHtml(trim($value)) ?: ' ';
}
+
if ($isOptional && trim(current($options))) {
- $result = array_merge([' ' => ' '], $result);
+ $result = array_merge([' '], $result);
}
return $result;
diff --git a/app/code/Magento/Customer/Test/Mftf/Metadata/CustomerExtensionAttributeMeta.xml b/app/code/Magento/Customer/Test/Mftf/Metadata/CustomerExtensionAttributeMeta.xml
index 06c7b74aef002..d9f738e9d8235 100644
--- a/app/code/Magento/Customer/Test/Mftf/Metadata/CustomerExtensionAttributeMeta.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Metadata/CustomerExtensionAttributeMeta.xml
@@ -9,10 +9,12 @@
+ integer
boolean
customer_nested_extension_attribute
+ integer
boolean
customer_nested_extension_attribute
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php b/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
index 0dc375908e561..c93e7110c5d96 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
@@ -18,11 +18,6 @@
class NavigationTest extends TestCase
{
- /**
- * Stub name top links
- */
- private const STUB_TOP_LINKS_NAME_IN_LAYOUT = 'top.links';
-
/**
* @var ObjectManagerHelper
*/
@@ -67,7 +62,7 @@ protected function setUp(): void
*
* @return void
*/
- public function testGetLinksWithCustomerAndWishList(): void
+ public function testGetLinksWithCustomerAndWishList()
{
$wishListLinkMock = $this->getMockBuilder(WishListLink::class)
->disableOriginalConstructor()
@@ -81,30 +76,30 @@ public function testGetLinksWithCustomerAndWishList(): void
$wishListLinkMock->expects($this->any())
->method('getSortOrder')
- ->willReturn(30);
+ ->willReturn(100);
$customerAccountLinkMock->expects($this->any())
->method('getSortOrder')
- ->willReturn(0);
+ ->willReturn(20);
- $topLinksNameInLayout = self::STUB_TOP_LINKS_NAME_IN_LAYOUT;
+ $nameInLayout = 'top.links';
$blockChildren = [
- 'customerAccountLink' => $customerAccountLinkMock,
- 'wishListLink' => $wishListLinkMock
+ 'wishListLink' => $wishListLinkMock,
+ 'customerAccountLink' => $customerAccountLinkMock
];
- $this->navigation->setNameInLayout($topLinksNameInLayout);
+ $this->navigation->setNameInLayout($nameInLayout);
$this->layoutMock->expects($this->any())
->method('getChildBlocks')
- ->with($topLinksNameInLayout)
+ ->with($nameInLayout)
->willReturn($blockChildren);
/* Assertion */
$this->assertEquals(
[
- 0 => $customerAccountLinkMock,
- 1 => $wishListLinkMock
+ 0 => $wishListLinkMock,
+ 1 => $customerAccountLinkMock
],
$this->navigation->getLinks()
);
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
index 260f35e3cf444..a2a15a4166b73 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -24,31 +24,31 @@
My Account
customer/account
- 1
+ 250
- 40
+ 200
Address Book
customer/address
- 50
+ 190
Account Information
customer/account/edit
- 60
+ 180
- 90
+ 130
diff --git a/app/code/Magento/Customer/view/frontend/layout/default.xml b/app/code/Magento/Customer/view/frontend/layout/default.xml
index 3c6be7a9ee5fe..3976fc6bd9090 100644
--- a/app/code/Magento/Customer/view/frontend/layout/default.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/default.xml
@@ -8,10 +8,10 @@
-
+
My Account
- 1
+ 110
@@ -20,11 +20,7 @@
-
- 30
-
-
+ template="Magento_Customer::account/link/authorization.phtml"/>
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
index 5b877500aa0c8..9821cff73a3dd 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -47,6 +47,7 @@ use Magento\Customer\Block\Widget\Name;
escapeHtml(__('Change Password')) ?>
+ getChildHtml('fieldset_edit_info_additional') ?>
getShowAddressFields()): ?>
getAttributeValidationClass('city'); ?>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
index 8976d0dda4673..5c9bf431bac1d 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
@@ -30,15 +30,6 @@ define([
url.setBaseUrl(window.BASE_URL);
options.sectionLoadUrl = url.build('customer/section/load');
- //TODO: remove global change, in this case made for initNamespaceStorage
- $.cookieStorage.setConf({
- path: '/',
- expires: 1
- });
-
- storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
- storageInvalidation = $.initNamespaceStorage('mage-cache-storage-section-invalidation').localStorage;
-
/**
* @param {Object} invalidateOptions
*/
@@ -222,6 +213,18 @@ define([
}
},
+ /**
+ * Storage init
+ */
+ initStorage: function () {
+ $.cookieStorage.setConf({
+ path: '/',
+ expires: new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000)
+ });
+ storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
+ storageInvalidation = $.initNamespaceStorage('mage-cache-storage-section-invalidation').localStorage;
+ },
+
/**
* Retrieve the list of sections that has expired since last page reload.
*
@@ -357,6 +360,7 @@ define([
*/
'Magento_Customer/js/customer-data': function (settings) {
options = settings;
+ customerData.initStorage();
invalidateCacheBySessionTimeOut(settings);
invalidateCacheByCloseCookieSession();
customerData.init();
diff --git a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
index a9e42cd01f2d5..152bdfef376fb 100644
--- a/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
+++ b/app/code/Magento/Developer/Test/Unit/Console/Command/XmlCatalogGenerateCommandTest.php
@@ -46,7 +46,7 @@ public function testExecuteBadType()
->with(
$this->equalTo(['urn:magento:framework:Module/etc/module.xsd' => $fixtureXmlFile]),
$this->equalTo('test')
- )->willReturn(null);
+ );
$formats = ['phpstorm' => $phpstormFormatMock];
$readFactory = $this->createMock(ReadFactory::class);
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
index dbf8eacbd7848..5a54a274485fe 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
@@ -12,7 +12,7 @@
use Magento\Store\Model\ScopeInterface;
/**
- * Downlaodable Sales Order Email items renderer
+ * Downloadable Sales Order Email items renderer
*
* @api
* @since 100.0.2
@@ -81,6 +81,8 @@ public function getLinks()
}
/**
+ * Returns links title
+ *
* @return null|string
*/
public function getLinksTitle()
@@ -92,6 +94,8 @@ public function getLinksTitle()
}
/**
+ * Returns purchased link url
+ *
* @param Item $item
* @return string
*/
diff --git a/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml b/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
index b86d05d20afaa..5ce45a27615e0 100644
--- a/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
@@ -12,7 +12,7 @@
+ isAssistanceAllowed()): ?>checked="checked"
+ class="checkbox">
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/frontend/web/js/opt-in.js b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/web/js/opt-in.js
new file mode 100644
index 0000000000000..d225d298b7771
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/frontend/web/js/opt-in.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'jquery'
+], function ($) {
+ 'use strict';
+
+ return function (config, element) {
+ $(element).on('submit', function () {
+ this.elements['assistance_allowed'].value =
+ this.elements['assistance_allowed_checkbox'].checked ?
+ config.allowAccess : config.denyAccess;
+ });
+ };
+});
diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
index 95a0cadd3abcc..eb6bd2aad236c 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
@@ -24,6 +24,7 @@ class SaveAssetLinks
private const TABLE_ASSET_KEYWORD = 'media_gallery_asset_keyword';
private const FIELD_ASSET_ID = 'asset_id';
private const FIELD_KEYWORD_ID = 'keyword_id';
+ private const TABLE_MEDIA_ASSET = 'media_gallery_asset';
/**
* @var ResourceConnection
@@ -73,6 +74,10 @@ public function execute(int $assetId, array $keywordIds): void
$this->deleteAssetKeywords($assetId, $obsoleteKeywordIds);
$this->insertAssetKeywords($assetId, $newKeywordIds);
+
+ if ($obsoleteKeywordIds || $newKeywordIds) {
+ $this->setAssetUpdatedAt($assetId);
+ }
}
/**
@@ -179,4 +184,28 @@ function (KeywordInterface $keyword): int {
$keywordsData
);
}
+
+ /**
+ * Updates modified date of media asset
+ *
+ * @param int $assetId
+ * @throws CouldNotSaveException
+ */
+ private function setAssetUpdatedAt(int $assetId): void
+ {
+ try {
+ $connection = $this->resourceConnection->getConnection();
+ $connection->update(
+ $connection->getTableName(self::TABLE_MEDIA_ASSET),
+ ['updated_at' => null],
+ ['id =?' => $assetId]
+ );
+ } catch (\Exception $exception) {
+ $this->logger->critical($exception);
+ throw new CouldNotSaveException(
+ __('Could not update assets modified date'),
+ $exception
+ );
+ }
+ }
}
diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/Keyword/SaveAssetLinksTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/Keyword/SaveAssetLinksTest.php
index 0bc81fbedaa19..d027f0ed21b53 100644
--- a/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/Keyword/SaveAssetLinksTest.php
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/Keyword/SaveAssetLinksTest.php
@@ -75,7 +75,7 @@ public function testAssetKeywordsSave(int $assetId, array $keywordIds, array $va
$expectedCalls = (int) (count($keywordIds));
if ($expectedCalls) {
- $this->resourceConnectionMock->expects($this->once())
+ $this->resourceConnectionMock->expects($this->exactly(2))
->method('getConnection')
->willReturn($this->connectionMock);
$this->resourceConnectionMock->expects($this->once())
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php
index 38569f5f698da..f780a116baf9e 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Path.php
@@ -6,6 +6,8 @@
namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\View\Element\UiComponent\ContextInterface;
use Magento\Framework\View\Element\UiComponentFactory;
use Magento\Ui\Component\Listing\Columns\Column;
@@ -63,13 +65,15 @@ public function prepareDataSource(array $dataSource)
* Replace category path ids with category names
*
* @param string $pathWithIds
+ * @return string
+ * @throws NoSuchEntityException
*/
private function getCategoryPathWithNames(string $pathWithIds): string
{
$categoryPathWithName = '';
$categoryIds = explode('/', $pathWithIds);
foreach ($categoryIds as $id) {
- if ($id == 1) {
+ if ($id == Category::TREE_ROOT_ID) {
continue;
}
$categoryName = $this->categoryRepository->get($id)->getName();
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
new file mode 100644
index 0000000000000..254ebd047c954
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
@@ -0,0 +1,133 @@
+uiComponentFactory = $uiComponentFactory;
+ $this->filterBuilder = $filterBuilder;
+ parent::__construct(
+ $context,
+ $uiComponentFactory,
+ $filterBuilder,
+ $filterModifier,
+ $optionsProvider,
+ $components,
+ $data
+ );
+ $this->bookmarkManagement = $bookmarkManagement;
+ $this->productRepository = $productRepository;
+ }
+
+ /**
+ * Prepare component configuration
+ *
+ * @return void
+ */
+ public function prepare()
+ {
+ $options = [];
+ $productIds = [];
+ $bookmarks = $this->bookmarkManagement->loadByNamespace($this->context->getNameSpace())->getItems();
+ foreach ($bookmarks as $bookmark) {
+ if ($bookmark->getIdentifier() === 'current') {
+ $applied = $bookmark->getConfig()['current']['filters']['applied'];
+ if (isset($applied[$this->getName()])) {
+ $productIds = $applied[$this->getName()];
+ }
+ }
+ }
+
+ foreach ($productIds as $id) {
+ $product = $this->productRepository->getById($id);
+ $options[] = [
+ 'value' => $id,
+ 'label' => $product->getName(),
+ 'is_active' => $product->getStatus(),
+ 'path' => $product->getSku(),
+ 'optgroup' => false
+
+ ];
+ }
+
+ $this->wrappedComponent = $this->uiComponentFactory->create(
+ $this->getName(),
+ parent::COMPONENT,
+ [
+ 'context' => $this->getContext(),
+ 'options' => $options
+ ]
+ );
+
+ $this->wrappedComponent->prepare();
+ $productsFilterJsConfig = array_replace_recursive(
+ $this->getJsConfig($this->wrappedComponent),
+ $this->getJsConfig($this)
+ );
+ $this->setData('js_config', $productsFilterJsConfig);
+
+ $this->setData(
+ 'config',
+ array_replace_recursive(
+ (array)$this->wrappedComponent->getData('config'),
+ (array)$this->getData('config')
+ )
+ );
+
+ $this->applyFilter();
+
+ parent::prepare();
+ }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
index 500ac10f4745a..ae01c29928b4a 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
@@ -24,7 +24,7 @@
+ Tooltip
+
+
+
+
+ -
-
+
•
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html
deleted file mode 100644
index 243ed1c2a5dc4..0000000000000
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/cancelButton.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/massactionButtons.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/massactionButtons.html
new file mode 100644
index 0000000000000..a4294434c82bf
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/massactions/massactionButtons.html
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
index a397bad0af698..15b94f823c2ba 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-details.html
@@ -12,7 +12,7 @@
- Magento\PaypalGraphQl\Model\PayflowLinkAdditionalDataProvider
- \Magento\PaypalGraphQl\Model\PayflowProAdditionalDataProvider
- \Magento\PaypalGraphQl\Model\HostedProAdditionalDataProvider +
- \Magento\PaypalGraphQl\Model\PayflowProCcVaultAdditionalDataProvider
- Magento\Quote\Model\Cart\BuyRequest\CustomizableOptionDataProvider +
- Magento\QuoteBundleOptions\Model\Cart\BuyRequest\BundleDataProvider +
- Magento\QuoteConfigurableOptions\Model\Cart\BuyRequest\SuperAttributeDataProvider +
- Magento\QuoteDownloadableLinks\Model\Cart\BuyRequest\DownloadableLinkDataProvider +
- Magento\SalesGraphQl\Model\OrderItemTypeResolver +
- OrderItem
- Magento\SalesGraphQl\Model\InvoiceItemTypeResolver +
- InvoiceItem +
- CreditMemoItem +
- ShipmentItem +
- Magento\SalesGraphQl\Model\Shipment\Item\ShipmentItemFormatter\Proxy
-
-
- Magento\Tinymce3\Model\Config\Source\Wysiwyg\Editor::WYSIWYG_EDITOR_CONFIG_VALUE
-- TinyMCE 3 (deprecated)
-
- - -
- ![]()
+ ![]()
|
- {{trans "%name," name=$billing.name}} +{{trans "%name," name=$order_data.customer_name}}
{{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
{{trans 'If you have questions about your order, you can email us at %store_email' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at %store_phone' store_phone=$store_phone |raw}}{{/depend}}.
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
index ed8f592b59638..64e9a61831956 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
@@ -8,7 +8,7 @@
Test Content Test Content Test Content Test Content Test Content Test Content |
); ?>)
+ ); ?>)
1 x 1
'}(),onPostRender:function(){this.lastX=this.lastY=0},onmousemove:function(e){var t,n,r=e.target;"A"===r.tagName.toUpperCase()&&(t=parseInt(r.getAttribute("data-mce-x"),10),n=parseInt(r.getAttribute("data-mce-y"),10),(this.isRtl()||"tl-tr"===this.parent().rel)&&(t=9-t),t===this.lastX&&n===this.lastY||(s(o,t,n,e.control),this.lastX=t,this.lastY=n))},onclick:function(e){var t=this;"A"===e.target.tagName.toUpperCase()&&(e.preventDefault(),e.stopPropagation(),t.parent().cancel(),o.undoManager.transact(function(){Na(o,t.lastX+1,t.lastY+1)}),o.addVisual())}}]};function m(e){return function(){o.execCommand(e)}}var g={text:"Table properties",context:"table",onPostRender:e,onclick:m("mceTableProps")},h={text:"Delete table",context:"table",onPostRender:e,cmd:"mceTableDelete"},p={text:"Row",context:"table",menu:[{text:"Insert row before",onclick:m("mceTableInsertRowBefore"),onPostRender:t},{text:"Insert row after",onclick:m("mceTableInsertRowAfter"),onPostRender:t},{text:"Delete row",onclick:m("mceTableDeleteRow"),onPostRender:t},{text:"Row properties",onclick:m("mceTableRowProps"),onPostRender:t},{text:"-"},{text:"Cut row",onclick:m("mceTableCutRow"),onPostRender:t},{text:"Copy row",onclick:m("mceTableCopyRow"),onPostRender:t},{text:"Paste row before",onclick:m("mceTablePasteRowBefore"),onPostRender:t},{text:"Paste row after",onclick:m("mceTablePasteRowAfter"),onPostRender:t}]},v={text:"Column",context:"table",menu:[{text:"Insert column before",onclick:m("mceTableInsertColBefore"),onPostRender:t},{text:"Insert column after",onclick:m("mceTableInsertColAfter"),onPostRender:t},{text:"Delete column",onclick:m("mceTableDeleteCol"),onPostRender:t}]},b={separator:"before",text:"Cell",context:"table",menu:[{text:"Cell properties",onclick:m("mceTableCellProps"),onPostRender:t},{text:"Merge cells",onclick:m("mceTableMergeCells"),onPostRender:function(){var t=this;a.push(t),r.fold(function(){l(t)},function(e){t.disabled(e.mergable().isNone())})}},{text:"Split cell",onclick:m("mceTableSplitCells"),onPostRender:function(){var t=this;c.push(t),r.fold(function(){l(t)},function(e){t.disabled(e.unmergable().isNone())})}}]};o.addMenuItem("inserttable",d),o.addMenuItem("tableprops",g),o.addMenuItem("deletetable",h),o.addMenuItem("row",p),o.addMenuItem("column",v),o.addMenuItem("cell",b)},Tf=function(n,r){return{insertTable:function(e,t){return Na(n,e,t)},setClipboardRows:function(e){return t=r,n=E(e,xe.fromDom),void t.set(R.from(n));var t,n},getClipboardRows:function(){return r.get().fold(function(){},function(e){return E(e,function(e){return e.dom()})})}}};e.add("table",function(t){var n,r=cc(t),e=yf(t,r.lazyResize),o=la(t,r.lazyWire),i=(n=t,{get:function(){var e=Fu(n);return hr(e,yr.selectedSelector()).fold(function(){return n.selection.getStart()===undefined?Rr.none():Rr.single(n.selection)},function(e){return Rr.multiple(e)})}}),u=lu(R.none());return Ba(t,o,e,i,u),Ar(t,i,o,e),Sf(t,i),Cf(t),Rf(t),t.on("PreInit",function(){t.serializer.addTempAttr(yr.firstSelected()),t.serializer.addTempAttr(yr.lastSelected())}),t.getParam("table_tab_navigation",!0,"boolean")&&t.on("keydown",function(e){nl(e,t,o,r.lazyWire)}),t.on("remove",function(){r.destroy(),e.destroy()}),Tf(t,u)})}(window);
\ No newline at end of file
diff --git a/lib/web/tiny_mce_4/plugins/textpattern/plugin.min.js b/lib/web/tiny_mce_4/plugins/textpattern/plugin.min.js
index c6ce64d0c8574..03f872a74e3a6 100644
--- a/lib/web/tiny_mce_4/plugins/textpattern/plugin.min.js
+++ b/lib/web/tiny_mce_4/plugins/textpattern/plugin.min.js
@@ -1 +1 @@
-!function(l){"use strict";var t,n,e,r,a,o=function(t){var n=t,e=function(){return n};return{get:e,set:function(t){n=t},clone:function(){return o(e())}}},i=tinymce.util.Tools.resolve("tinymce.PluginManager"),f=function(t){return function(){return t}},u=f(!1),s=f(!0),c=u,d=s,g=function(){return m},m=(r={fold:function(t,n){return t()},is:c,isSome:c,isNone:d,getOr:e=function(t){return t},getOrThunk:n=function(t){return t()},getOrDie:function(t){throw new Error(t||"error: getOrDie called on none.")},getOrNull:function(){return null},getOrUndefined:function(){return undefined},or:e,orThunk:n,map:g,ap:g,each:function(){},bind:g,flatten:g,exists:c,forall:d,filter:g,equals:t=function(t){return t.isNone()},equals_:t,toArray:function(){return[]},toString:f("none()")},Object.freeze&&Object.freeze(r),r),h=function(e){var t=function(){return e},n=function(){return a},r=function(t){return t(e)},a={fold:function(t,n){return n(e)},is:function(t){return e===t},isSome:d,isNone:c,getOr:t,getOrThunk:t,getOrDie:t,getOrNull:t,getOrUndefined:t,or:n,orThunk:n,map:function(t){return h(t(e))},ap:function(t){return t.fold(g,function(t){return h(t(e))})},each:function(t){t(e)},bind:r,flatten:t,exists:r,forall:r,filter:function(t){return t(e)?a:m},equals:function(t){return t.is(e)},equals_:function(t,n){return t.fold(c,function(t){return n(e,t)})},toArray:function(){return[e]},toString:function(){return"some("+e+")"}};return a},p={some:h,none:g,from:function(t){return null===t||t===undefined?m:h(t)}},v=(a="function",function(t){return function(t){if(null===t)return"null";var n=typeof t;return"object"===n&&(Array.prototype.isPrototypeOf(t)||t.constructor&&"Array"===t.constructor.name)?"array":"object"===n&&(String.prototype.isPrototypeOf(t)||t.constructor&&"String"===t.constructor.name)?"string":n}(t)===a}),O=Array.prototype.slice,y=function(t,n){for(var e=[],r=0,a=t.length;r'+t.encode(t.state.get("text"))+"
0%
'+i+'
'},postRender:function(){var t=this;return c.setTimeout(function(){t.$el.addClass(t.classPrefix+"in"),xe(t,t.state.get("text"))},100),t._super()},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().firstChild.innerHTML=t.value,xe(e,t.value)}),e.progressBar&&(e.progressBar.bindStates(),e.progressBar.state.on("change:value",function(t){xe(e,e.state.get("text"))})),e._super()},close:function(){return this.fire("close").isDefaultPrevented()||this.remove(),this},repaint:function(){var t,e;t=this.getEl().style,e=this._layoutRect,t.left=e.x+"px",t.top=e.y+"px",t.zIndex=65534}});function _e(o){var s=function(t){return t.inline?t.getElement():t.getContentAreaContainer()};return{open:function(t,e){var n,i=C.extend(t,{maxWidth:(n=s(o),Mt.getSize(n).width)}),r=new we(i);return 0<(r.args=i).timeout&&(r.timer=setTimeout(function(){r.close(),e()},i.timeout)),r.on("close",function(){e()}),r.renderTo(),r},close:function(t){t.close()},reposition:function(t){Ct(t,function(t){t.moveTo(0,0)}),function(n){if(0'+e.state.get("text")+"
"+o+r+''+(t.settings.html||"")+e.renderHtml(t)+"
"},postRender:function(){var t,e=this;return e.items().exec("postRender"),e._super(),e._layout.postRender(e),e.state.set("rendered",!0),e.settings.style&&e.$el.css(e.settings.style),e.settings.border&&(t=e.borderBox,e.$el.css({"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left})),e.parent()||(e.keyboardNav=He({root:e})),e},initLayoutRect:function(){var t=this._super();return this._layout.recalc(this),t},recalc:function(){var t=this,e=t._layoutRect,n=t._lastRect;if(!n||n.w!==e.w||n.h!==e.h)return t._layout.recalc(t),e=t.layoutRect(),t._lastRect={x:e.x,y:e.y,w:e.w,h:e.h},!0},reflow:function(){var t;if(ee.remove(this),this.visible()){for(ce.repaintControls=[],ce.repaintControls.map={},this.recalc(),t=ce.repaintControls.length;t--;)ce.repaintControls[t].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),ce.repaintControls=[]}return this}}),We={init:function(){this.on("repaint",this.renderScroll)},renderScroll:function(){var p=this,v=2;function n(){var m,g,t;function e(t,e,n,i,r,o){var s,a,l,u,c,d,f,h;if(a=p.getEl("scroll"+t)){if(f=e.toLowerCase(),h=n.toLowerCase(),Nt(p.getEl("absend")).css(f,p.layoutRect()[i]-1),!r)return void Nt(a).css("display","none");Nt(a).css("display","block"),s=p.getEl("body"),l=p.getEl("scroll"+t+"t"),u=s["client"+n]-2*v,c=(u-=m&&g?a["client"+o]:0)/s["scroll"+n],(d={})[f]=s["offset"+e]+v,d[h]=u,Nt(a).css(d),(d={})[f]=s["scroll"+e]*c,d[h]=u*c,Nt(l).css(d)}}t=p.getEl("body"),m=t.scrollWidth>t.clientWidth,g=t.scrollHeight>t.clientHeight,e("h","Left","Width","contentW",m,"Height"),e("v","Top","Height","contentH",g,"Width")}p.settings.autoScroll&&(p._hasScroll||(p._hasScroll=!0,function(){function t(s,a,l,u,c){var d,t=p._id+"-scroll"+s,e=p.classPrefix;Nt(p.getEl()).append(''),p.draghelper=new Ce(t+"t",{start:function(){d=p.getEl("body")["scroll"+a],Nt("#"+t).addClass(e+"active")},drag:function(t){var e,n,i,r,o=p.layoutRect();n=o.contentW>o.innerW,i=o.contentH>o.innerH,r=p.getEl("body")["client"+l]-2*v,e=(r-=n&&i?p.getEl("scroll"+s)["client"+c]:0)/p.getEl("body")["scroll"+l],p.getEl("body")["scroll"+a]=d+t["delta"+u]/e},stop:function(){Nt("#"+t).removeClass(e+"active")}})}p.classes.add("scroll"),t("v","Top","Height","Y","Width"),t("h","Left","Width","X","Height")}(),p.on("wheel",function(t){var e=p.getEl("body");e.scrollLeft+=10*(t.deltaX||0),e.scrollTop+=10*t.deltaY,n()}),Nt(p.getEl("body")).on("scroll",n)),n())}},De=Pe.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[We],renderHtml:function(){var t=this,e=t._layout,n=t.settings.html;return t.preRender(),e.preRender(t),void 0===n?n='
'+e.renderHtml(t)+"
":("function"==typeof n&&(n=n.call(t)),t._hasBody=!1),''+(t._preBodyHtml||"")+n+"
"}}),Ae={resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(t,e){if(t<=1||e<=1){var n=Mt.getWindowSize();t=t<=1?t*n.w:t,e=e<=1?e*n.h:e}return this._layoutRect.autoResize=!1,this.layoutRect({minW:t,minH:e,w:t,h:e}).reflow()},resizeBy:function(t,e){var n=this.layoutRect();return this.resizeTo(n.w+t,n.h+e)}},Be=[],Le=[];function Ie(t,e){for(;t;){if(t===e)return!0;t=t.parent()}}function ze(){Te||(Te=function(t){2!==t.button&&function(t){for(var e=Be.length;e--;){var n=Be[e],i=n.getParentCtrl(t.target);if(n.settings.autohide){if(i&&(Ie(i,n)||n.parent()===i))continue;(t=n.fire("autohide",{target:t.target})).isDefaultPrevented()||n.hide()}}}(t)},Nt(_.document).on("click touchstart",Te))}function Fe(r){var t=Mt.getViewPort().y;function e(t,e){for(var n,i=0;i'+t.encode(r.title)+'
'+o+'
'+a+"
"+s+"";r+=""}return r+="",r+=""}(r,o)),(t=i.dom.select("*[data-mce-id]")[0]).removeAttribute("data-mce-id"),e=i.dom.select("td,th",t),i.selection.setCursorLocation(e[0],0)}))},wn=function(t,e){t.execCommand("FormatBlock",!1,e)},_n=function(t,e,n){var i,r;r=(i=t.editorUpload.blobCache).create(un("mceu"),n,e),i.add(r),t.insertContent(t.dom.createHTML("img",{src:r.blobUri()}))},Rn=function(t,e){0===e.trim().length?yn(t):bn(t,e)},Cn=yn,kn=function(n,t){n.addButton("quicklink",{icon:"link",tooltip:"Insert/Edit link",stateSelector:"a[href]",onclick:function(){t.showForm(n,"quicklink")}}),n.addButton("quickimage",{icon:"image",tooltip:"Insert image",onclick:function(){an().then(function(t){var e=t[0];sn(e).then(function(t){_n(n,t,e)})})}}),n.addButton("quicktable",{icon:"table",tooltip:"Insert table",onclick:function(){t.hide(),xn(n,2,2)}}),function(e){for(var t=function(t){return function(){wn(e,t)}},n=1;n<6;n++){var i="h"+n;e.addButton(i,{text:i.toUpperCase(),tooltip:"Heading "+n,stateSelector:i,onclick:t(i),onPostRender:function(){this.getEl().firstChild.firstChild.style.fontWeight="bold"}})}}(n)},En=function(){var t=h.container;if(t&&"static"!==v.DOM.getStyle(t,"position",!0)){var e=v.DOM.getPos(t),n=e.x-t.scrollLeft,i=e.y-t.scrollTop;return vt.some({x:n,y:i})}return vt.none()},Hn=function(t){return/^www\.|\.(com|org|edu|gov|uk|net|ca|de|jp|fr|au|us|ru|ch|it|nl|se|no|es|mil)$/i.test(t.trim())},Tn=function(t){return/^https?:\/\//.test(t.trim())},Sn=function(t,e){return!Tn(e)&&Hn(e)?(n=t,i=e,new on(function(e){n.windowManager.confirm("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(t){e(!0===t?"http://"+i:i)})})):on.resolve(e);var n,i},Mn=function(r,e){var t,n,i,o={};return t="quicklink",n={items:[{type:"button",name:"unlink",icon:"unlink",onclick:function(){r.focus(),Cn(r),e()},tooltip:"Remove link"},{type:"filepicker",name:"linkurl",placeholder:"Paste or type a link",filetype:"file",onchange:function(t){var e=t.meta;e&&e.attach&&(o={href:this.value(),attach:e.attach})}},{type:"button",icon:"checkmark",subtype:"primary",tooltip:"Ok",onclick:"submit"}],onshow:function(t){if(t.control===this){var e,n="";(e=r.dom.getParent(r.selection.getStart(),"a[href]"))&&(n=r.dom.getAttrib(e,"href")),this.fromJSON({linkurl:n}),i=this.find("#unlink"),e?i.show():i.hide(),this.find("#linkurl")[0].focus()}var i},onsubmit:function(t){Sn(r,t.data.linkurl).then(function(t){r.undoManager.transact(function(){t===o.href&&(o.attach(),o={}),Rn(r,t)}),e()})}},(i=ke.create(C.extend({type:"form",layout:"flex",direction:"row",padding:5,name:t,spacing:3},n))).on("show",function(){i.find("textbox").eq(0).each(function(t){t.focus()})}),i},Nn=function(n,t,e){var o,i,s=[];if(e)return C.each(L(i=e)?i:W(i)?i.split(/[ ,]/):[],function(t){if("|"===t)o=null;else if(n.buttons[t]){o||(o={type:"buttongroup",items:[]},s.push(o));var e=n.buttons[t];B(e)&&(e=e()),e.type=e.type||"button",(e=ke.create(e)).on("postRender",(i=n,r=e,function(){var e,t,n=(t=function(t,e){return{selector:t,handler:e}},(e=r).settings.stateSelector?t(e.settings.stateSelector,function(t){e.active(t)}):e.settings.disabledStateSelector?t(e.settings.disabledStateSelector,function(t){e.disabled(t)}):null);null!==n&&i.selection.selectorChanged(n.selector,n.handler)})),o.items.push(e)}var i,r}),ke.create({type:"toolbar",layout:"flow",name:t,items:s})},On=function(){var l,c,o=function(t){return 0
'+(t.settings.html||"")+e.renderHtml(t)+"
'+t.encode(t.state.get("text"))+"
"},bindStates:function(){var o=this;function e(t){o.classes.toggle("checked",t),o.aria("checked",t)}return o.state.on("change:text",function(t){o.getEl("al").firstChild.data=o.translate(t.value)}),o.state.on("change:checked change:value",function(t){o.fire("change"),e(t.value)}),o.state.on("change:icon",function(t){var e=t.value,n=o.classPrefix;if(void 0===e)return o.settings.icon;e=(o.settings.icon=e)?n+"ico "+n+"i-"+o.settings.icon:"";var i=o.getEl().firstChild,r=i.getElementsByTagName("i")[0];e?(r&&r===i.firstChild||(r=_.document.createElement("i"),i.insertBefore(r,i.firstChild)),r.className=e):r&&i.removeChild(r)}),o.state.get("checked")&&e(!0),o._super()}}),In=tinymce.util.Tools.resolve("tinymce.util.VK"),zn=ye.extend({init:function(i){var r=this;r._super(i),i=r.settings,r.classes.add("combobox"),r.subinput=!0,r.ariaTarget="inp",i.menu=i.menu||i.values,i.menu&&(i.icon="caret"),r.on("click",function(t){var e=t.target,n=r.getEl();if(Nt.contains(n,e)||e===n)for(;e&&e!==n;)e.id&&-1!==e.id.indexOf("-open")&&(r.fire("action"),i.menu&&(r.showMenu(),t.aria&&r.menu.items()[0].focus())),e=e.parentNode}),r.on("keydown",function(t){var e;13===t.keyCode&&"INPUT"===t.target.nodeName&&(t.preventDefault(),r.parents().reverse().each(function(t){if(t.toJSON)return e=t,!1}),r.fire("submit",{data:e.toJSON()}))}),r.on("keyup",function(t){if("INPUT"===t.target.nodeName){var e=r.state.get("value"),n=t.target.value;n!==e&&(r.state.set("value",n),r.fire("autocomplete",t))}}),r.on("mouseover",function(t){var e=r.tooltip().moveTo(-65535);if(r.statusLevel()&&-1!==t.target.className.indexOf(r.classPrefix+"status")){var n=r.statusMessage()||"Ok",i=e.text(n).show().testMoveRel(t.target,["bc-tc","bc-tl","bc-tr"]);e.classes.toggle("tooltip-n","bc-tc"===i),e.classes.toggle("tooltip-nw","bc-tl"===i),e.classes.toggle("tooltip-ne","bc-tr"===i),e.moveRel(t.target,i)}})},statusLevel:function(t){return 0