Merge branch 'release/2.28.0'

Author: adamwaclawczyk

CHANGELOG.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.28.0] - 2025-03-25
+### Added
+- Auto populate node title ([#325](https://github.com/SnowdogApps/magento2-menu/pull/325))
+- Add missing $escaper and $viewModels declarations ([#350](https://github.com/SnowdogApps/magento2-menu/pull/350))
+- Import categories by store view ([#352](https://github.com/SnowdogApps/magento2-menu/pull/352))
+- Add external vue providers config option
+### Changed
+- Bump cross-spawn from 7.0.3 to 7.0.6 ([#349](https://github.com/SnowdogApps/magento2-menu/pull/349))
+- Improve graphql performance
+
 ## [2.27.2] - 2024-11-08
 ### Fixed
 - Issue when saving nodes w/ db prefix ([#345](https://github.com/SnowdogApps/magento2-menu/pull/345))

Controller/Adminhtml/Node/ProductName.php

@@ -0,0 +1,68 @@
+<?php
+declare(strict_types=1);
+
+namespace Snowdog\Menu\Controller\Adminhtml\Node;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+class ProductName extends Action implements HttpPostActionInterface
+{
+    /**
+     * @inheritDoc
+     */
+    const ADMIN_RESOURCE = 'Snowdog_Menu::menus';
+
+    /**
+     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    public function __construct(
+        Context $context,
+        ProductRepositoryInterface $productRepository
+    ) {
+        parent::__construct($context);
+        $this->productRepository = $productRepository;
+    }
+
+    public function execute()
+    {
+        $storeId = (int) $this->_request->getParam('store_id', 0);
+        $productId = $this->_request->getParam('product_id');
+        if (empty($productId)) {
+            return $this->getMissingProductIdResult();
+        }
+
+        try {
+            $product = $this->productRepository->getById($productId, false, $storeId);
+        } catch (NoSuchEntityException $e) {
+            return $this->getProductNotFoundResult();
+        }
+
+        $result = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+
+        return $result->setData(['product_name' => $product->getName()]);
+    }
+
+    private function getMissingProductIdResult(): ResultInterface
+    {
+        return $this->resultFactory
+            ->create(ResultFactory::TYPE_JSON)
+            ->setHttpResponseCode(400)
+            ->setData(['message' => __('Missing required product_id param')]);
+    }
+
+    private function getProductNotFoundResult(): ResultInterface
+    {
+        return $this->resultFactory
+            ->create(ResultFactory::TYPE_JSON)
+            ->setHttpResponseCode(404)
+            ->setData(['message' => __('Product not found')]);
+    }
+}

Model/GraphQl/Resolver/DataProvider/Node.php

@@ -4,7 +4,7 @@
 
 namespace Snowdog\Menu\Model\GraphQl\Resolver\DataProvider;
 
-use Magento\Framework\Exception\LocalizedException;
+use Exception;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Snowdog\Menu\Api\Data\NodeInterface;
 use Snowdog\Menu\Api\NodeRepositoryInterface;
@@ -124,6 +124,7 @@ private function convertData(NodeInterface $node): array
      */
     private function loadModels($nodes, $storeId): void
     {
+        $modelsToLoadByType = [];
         /** @var NodeInterface $node */
         foreach ($nodes as $node) {
             $type = $node->getType();
@@ -133,12 +134,18 @@ private function loadModels($nodes, $storeId): void
             if (!in_array($type, TypeModel::TYPES)) {
                 continue;
             }
+            $modelsToLoadByType[$type][] = $node->getContent();
+        }
+
+        foreach ($modelsToLoadByType as $type => $ids) {
+            if (!is_array($ids)) {
+                continue;
+            }
             try {
-                $model = $this->typeModel->getModel($type, $node->getContent(), $storeId);
-            } catch (NoSuchEntityException|LocalizedException $e) {
-                $model = null;
+                $this->loadedModels[$type] = $this->typeModel->getModels($type, $ids ?? [], $storeId);
+            } catch (Exception $e) {
+                continue;
             }
-            $this->loadedModels[$type][$node->getContent()] = $model;
         }
     }
 
@@ -152,8 +159,7 @@ private function getUrlKey(NodeInterface $node): ?string
             if (!isset($this->loadedModels[$node->getType()][$node->getContent()])) {
                 return null;
             }
-            $currentModel = $this->loadedModels[$node->getType()][$node->getContent()];
-            return $this->typeModel->getModelUrlKey($node->getType(), $currentModel);
+            return $this->loadedModels[$node->getType()][$node->getContent()];
         } elseif ($node->getType() == self::NODE_TYPE_CUSTOM_URL) {
             return $node->getContent();
         } else {

Model/GraphQl/Resolver/DataProvider/Node/TypeModel.php

@@ -1,68 +1,34 @@
 <?php
+declare(strict_types=1);
 
 namespace Snowdog\Menu\Model\GraphQl\Resolver\DataProvider\Node;
 
-use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Cms\Api\Data\PageInterface;
-use Magento\Cms\Api\PageRepositoryInterface;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 
 class TypeModel
 {
     const TYPES = ["category", "product", "cms_page"];
-    
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
-    /**
-     * @var CategoryRepositoryInterface
-     */
-    private $categoryRepository;
+
     /**
-     * @var PageRepositoryInterface
+     * @var \Snowdog\Menu\Model\ResourceModel\NodeType\AbstractNode[]
      */
-    private $pageRepository;
+    private $typeModels = [];
 
     public function __construct(
-        ProductRepositoryInterface $productRepository,
-        CategoryRepositoryInterface $categoryRepository,
-        PageRepositoryInterface $pageRepository
+        array $typeModels = []
     ) {
-        $this->productRepository = $productRepository;
-        $this->categoryRepository = $categoryRepository;
-        $this->pageRepository = $pageRepository;
+        $this->typeModels = $typeModels;
     }
 
-    /**
-     * @param $type
-     * @param $modelId
-     * @param $storeId
-     * @return ProductInterface|CategoryInterface|PageInterface|null
-     * @throws LocalizedException
-     * @throws NoSuchEntityException
-     */
-    public function getModel($type, $modelId, $storeId)
+    public function getModels($type, $modelIds, $storeId)
     {
-        $model = null;
-        switch ($type) {
-            case "product":
-                $model = $this->productRepository->getById($modelId, false, $storeId);
-                break;
-            case "category":
-                $model = $this->categoryRepository->get($modelId, $storeId);
-                break;
-            case "cms_page":
-                $model = $this->pageRepository->getById($modelId);
-                break;
-            default:
-                break;
+        if (isset($this->typeModels[$type])) {
+            return $this->typeModels[$type]->fetchData($storeId, $modelIds);
         }
-        return $model;
+
+        return [];
     }
 
     public function getModelUrlKey($type, $model): ?string

Model/VueProvider.php

@@ -13,13 +13,23 @@ class VueProvider
      */
     private $components;
 
+    /**
+     * 3rd party extensions have to provide full path
+     *
+     * @var array
+     */
+    private $externalComponents;
+
     /**
      * @param array $components
+     * @param array $externalComponents
      */
     public function __construct(
-        array $components = []
+        array $components = [],
+        array $externalComponents = []
     ) {
         $this->components = $components;
+        $this->externalComponents = $externalComponents;
     }
 
     /**
@@ -31,6 +41,9 @@ public function getComponents(): array
         foreach ($this->components as $component) {
             $data[] = sprintf(self::COMPONENT_PATH, $component);
         }
+        foreach ($this->externalComponents as $externalComponent) {
+            $data[] = $externalComponent;
+        }
 
         return $data;
     }

Plugin/Model/ResourceModel/Category/TreePlugin.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Snowdog\Menu\Plugin\Model\ResourceModel\Category;
+
+use Magento\Catalog\Model\ResourceModel\Category\Tree;
+use Magento\Framework\App\RequestInterface;
+
+class TreePlugin
+{
+    private RequestInterface $request;
+
+    public function __construct(
+        RequestInterface $request
+    ) {
+        $this->request = $request;
+    }
+
+
+    /**
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeAddCollectionData(Tree $subject, $collection = null): array
+    {
+        $postData = $this->request->getPost();
+        $storeId = $postData['store_id'];
+
+        if (!isset($postData['store_id'])) {
+            return [$collection];
+        }
+
+        $collection->setProductStoreId(
+            $storeId
+        )->setStoreId(
+            $storeId
+        );
+
+        return [$collection];
+    }
+}

README.md

@@ -31,6 +31,10 @@ Here are some scenarios where Snowdog's Menu can be effectively used:
 ## User Guide and Documentation
 To learn more about Magento 2 Menu by Snowdog, go to [wiki](https://github.com/SnowdogApps/magento2-menu/wiki).
 
+## Magento Versions Compatibility
+Menu can be installed on most 2.x Magento versions.
+If your Magento version does not work with newest Menu version, see [Contributing](#contributing).
+
 ## Contributing
 Contributions are welcome! If you find a bug or have a feature request, feel free to open an issue or submit a pull request.