Merge pull request #39 from magento-engcom/msi-stock-ui-aggregation

WIP: Msi stock ui aggregation

Author: Valeriy Nayda

app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php

@@ -15,7 +15,7 @@
 use Magento\InventoryApi\Api\Data\SourceInterface;
 
 /**
- * Class Edit
+ * Edit Controller
  */
 class Edit extends Action
 {
@@ -42,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute()
     {

app/code/Magento/Inventory/Controller/Adminhtml/Source/Index.php

@@ -10,7 +10,7 @@
 use Magento\Framework\Controller\ResultFactory;
 
 /**
- * Class Index
+ * Index Controller
  */
 class Index extends Action
 {
@@ -20,7 +20,7 @@ class Index extends Action
     const ADMIN_RESOURCE = 'Magento_Inventory::source';
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute()
     {

app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php

@@ -7,16 +7,16 @@
 
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\Framework\EntityManager\HydratorInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\InventoryApi\Api\SourceRepositoryInterface;
 use Magento\InventoryApi\Api\Data\SourceInterface;
 
 /**
- * Class InlineEdit
+ * InlineEdit Controller
  */
 class InlineEdit extends Action
 {
@@ -26,9 +26,9 @@ class InlineEdit extends Action
     const ADMIN_RESOURCE = 'Magento_Inventory::source';
 
     /**
-     * @var HydratorInterface
+     * @var DataObjectHelper
      */
-    private $hydrator;
+    private $dataObjectHelper;
 
     /**
      * @var SourceRepositoryInterface
@@ -37,21 +37,21 @@ class InlineEdit extends Action
 
     /**
      * @param Context $context
-     * @param HydratorInterface $hydrator
+     * @param DataObjectHelper $dataObjectHelper
      * @param SourceRepositoryInterface $sourceRepository
      */
     public function __construct(
         Context $context,
-        HydratorInterface $hydrator,
+        DataObjectHelper $dataObjectHelper,
         SourceRepositoryInterface $sourceRepository
     ) {
         parent::__construct($context);
-        $this->hydrator = $hydrator;
+        $this->dataObjectHelper = $dataObjectHelper;
         $this->sourceRepository = $sourceRepository;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute()
     {
@@ -65,7 +65,7 @@ public function execute()
                     $source = $this->sourceRepository->get(
                         $itemData[SourceInterface::SOURCE_ID]
                     );
-                    $source = $this->hydrator->hydrate($source, $itemData);
+                    $this->dataObjectHelper->populateWithArray($source, $itemData, SourceInterface::class);
                     $this->sourceRepository->save($source);
                 } catch (NoSuchEntityException $e) {
                     $errorMessages[] = __(
@@ -79,7 +79,7 @@ public function execute()
                 }
             }
         } else {
-            $errorMessages[] = __('Please correct the data sent.');
+            $errorMessages[] = __('Please correct the sent data.');
         }
 
         /** @var Json $resultJson */

app/code/Magento/Inventory/Controller/Adminhtml/Source/NewAction.php

@@ -11,7 +11,7 @@
 use Magento\Framework\Controller\ResultFactory;
 
 /**
- * Class NewAction
+ * NewAction Controller
  */
 class NewAction extends Action
 {
@@ -21,7 +21,7 @@ class NewAction extends Action
     const ADMIN_RESOURCE = 'Magento_Inventory::source';
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute()
     {

app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php

@@ -8,17 +8,15 @@
 use Exception;
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
-use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Registry;
 use Magento\InventoryApi\Api\Data\SourceInterface;
 use Magento\InventoryApi\Api\Data\SourceInterfaceFactory;
 use Magento\InventoryApi\Api\SourceRepositoryInterface;
 
 /**
- * Class Save
+ * Save Controller
  */
 class Save extends Action
 {
@@ -38,48 +36,38 @@ class Save extends Action
     private $sourceRepository;
 
     /**
-     * @var DataObjectHelper
+     * @var SourceHydrator
      */
-    private $dataObjectHelper;
-
-    /**
-     * @var CarrierRequestDataHydrator
-     */
-    private $carrierRequestDataHydrator;
+    private $sourceHydrator;
 
     /**
      * @param Context $context
      * @param SourceInterfaceFactory $sourceFactory
      * @param SourceRepositoryInterface $sourceRepository
-     * @param DataObjectHelper $dataObjectHelper
-     * @param CarrierRequestDataHydrator $carrierRequestDataHydrator
+     * @param SourceHydrator $sourceHydrator
      */
     public function __construct(
         Context $context,
         SourceInterfaceFactory $sourceFactory,
         SourceRepositoryInterface $sourceRepository,
-        DataObjectHelper $dataObjectHelper,
-        CarrierRequestDataHydrator $carrierRequestDataHydrator
+        SourceHydrator $sourceHydrator
     ) {
         parent::__construct($context);
         $this->sourceFactory = $sourceFactory;
         $this->sourceRepository = $sourceRepository;
-        $this->dataObjectHelper = $dataObjectHelper;
-        $this->carrierRequestDataHydrator = $carrierRequestDataHydrator;
+        $this->sourceHydrator = $sourceHydrator;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
         $requestData = $this->getRequest()->getParams();
         if ($this->getRequest()->isPost() && !empty($requestData['general'])) {
             try {
-                $sourceId = !empty($requestData['general'][SourceInterface::SOURCE_ID])
-                    ? $requestData['general'][SourceInterface::SOURCE_ID] : null;
-
+                $sourceId = $requestData['general'][SourceInterface::SOURCE_ID] ?? null;
                 $sourceId = $this->processSave($sourceId, $requestData);
 
                 $this->messageManager->addSuccessMessage(__('The Source has been saved.'));
@@ -92,7 +80,7 @@ public function execute()
                 $this->messageManager->addErrorMessage($e->getMessage());
                 $this->processRedirectAfterFailureSave($resultRedirect, $sourceId);
             } catch (Exception $e) {
-                $this->messageManager->addErrorMessage(__('Could not save source'));
+                $this->messageManager->addErrorMessage(__('Could not save source.'));
                 $this->processRedirectAfterFailureSave($resultRedirect, $sourceId);
             }
         } else {
@@ -115,8 +103,7 @@ private function processSave($sourceId, array $requestData)
             /** @var SourceInterface $source */
             $source = $this->sourceFactory->create();
         }
-        $this->dataObjectHelper->populateWithArray($source, $requestData['general'], SourceInterface::class);
-        $source = $this->carrierRequestDataHydrator->hydrate($source, $requestData);
+        $source = $this->sourceHydrator->hydrate($source, $requestData);
 
         $sourceId = $this->sourceRepository->save($source);
         return $sourceId;

app/code/Magento/Inventory/Controller/Adminhtml/Source/CarrierRequestDataHydrator.php renamed to app/code/Magento/Inventory/Controller/Adminhtml/Source/SourceCarrierHydrator.php

@@ -13,9 +13,9 @@
 use Magento\Shipping\Model\Config;
 
 /**
- * Class CarrierRequestDataHydrator
+ * Populate Source by carrier code links
  */
-class CarrierRequestDataHydrator
+class SourceCarrierHydrator
 {
     /**
      * @var SourceCarrierLinkInterface
@@ -35,8 +35,6 @@ class CarrierRequestDataHydrator
     private $shippingConfig;
 
     /**
-     * CarrierRequestDataHydrator constructor
-     *
      * @param SourceCarrierLinkInterfaceFactory $carrierLinkFactory
      * @param DataObjectHelper $dataObjectHelper
      * @param Config $shippingConfig

app/code/Magento/Inventory/Controller/Adminhtml/Source/SourceHydrator.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Inventory\Controller\Adminhtml\Source;
+
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\InventoryApi\Api\Data\SourceInterface;
+
+/**
+ * Populate Source by data. Specified for form structure
+ *
+ * @api
+ */
+class SourceHydrator
+{
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var SourceCarrierHydrator
+     */
+    private $sourceCarrierHydrator;
+
+    /**
+     * @param DataObjectHelper $dataObjectHelper
+     * @param SourceCarrierHydrator $sourceCarrierHydrator
+     */
+    public function __construct(
+        DataObjectHelper $dataObjectHelper,
+        SourceCarrierHydrator $sourceCarrierHydrator
+    ) {
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->sourceCarrierHydrator = $sourceCarrierHydrator;
+    }
+
+    /**
+     * @param SourceInterface $source
+     * @param array $data
+     * @return SourceInterface
+     */
+    public function hydrate(SourceInterface $source, array $data)
+    {
+        $this->dataObjectHelper->populateWithArray($source, $data['general'], SourceInterface::class);
+        $source = $this->sourceCarrierHydrator->hydrate($source, $data['general']);
+        return $source;
+    }
+}

app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Inventory\Controller\Adminhtml\Stock;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Page;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\InventoryApi\Api\StockRepositoryInterface;
+use Magento\InventoryApi\Api\Data\StockInterface;
+
+/**
+ * Edit Controller
+ */
+class Edit extends Action
+{
+    /**
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
+
+    /**
+     * @var StockRepositoryInterface
+     */
+    private $stockRepository;
+
+    /**
+     * @param Context $context
+     * @param StockRepositoryInterface $stockRepository
+     */
+    public function __construct(
+        Context $context,
+        StockRepositoryInterface $stockRepository
+    ) {
+        parent::__construct($context);
+        $this->stockRepository = $stockRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute()
+    {
+        $stockId = $this->getRequest()->getParam(StockInterface::STOCK_ID);
+        try {
+            $stock = $this->stockRepository->get($stockId);
+
+            /** @var Page $result */
+            $result = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+            $result->setActiveMenu('Magento_Inventory::stock')
+                ->addBreadcrumb(__('Edit Stock'), __('Edit Stock'));
+            $result->getConfig()
+                ->getTitle()
+                ->prepend(__('Edit Stock: %1', $stock->getName()));
+        } catch (NoSuchEntityException $e) {
+            /** @var Redirect $result */
+            $result = $this->resultRedirectFactory->create();
+            $this->messageManager->addErrorMessage(
+                __('Stock with id "%1" does not exist.', $stockId)
+            );
+            $result->setPath('*/*');
+        }
+        return $result;
+    }
+}