MSI: Integrate the Sales Channel output to the Manage Stock view

Author: Valeriy Nayda

app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_source_listing.xml

@@ -268,7 +268,7 @@
                 <label translate="true">Priority</label>
             </settings>
         </column>
-        <actionsColumn name="actions" class="Magento\Backend\Ui\Component\Listing\Column\EditAction">
+        <actionsColumn name="actions" class="Magento\Backend\Ui\Component\Listing\Column\EditAction" sortOrder="100">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="editUrlPath" xsi:type="string">inventory/source/edit</item>

app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_listing.xml

@@ -118,7 +118,7 @@
                 </editor>
             </settings>
         </column>
-        <actionsColumn name="actions" class="Magento\Backend\Ui\Component\Listing\Column\EditAction">
+        <actionsColumn name="actions" class="Magento\Backend\Ui\Component\Listing\Column\EditAction" sortOrder="100">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="editUrlPath" xsi:type="string">inventory/stock/edit</item>

app/code/Magento/InventorySales/Plugin/Inventory/Ui/StockDataProvider/SalesChannels.php

@@ -19,24 +19,22 @@ class SalesChannels
     /**
      * @var GetAssignedSalesChannelsForStockInterface
      */
-
-    private $channelsByStock;
+    private $getAssignedSalesChannelsForStock;
 
     /**
      * @var StockRepository
      */
     private $stockRepository;
 
     /**
-     * SalesChannels constructor.
-     * @param GetAssignedSalesChannelsForStockInterface $channelsByStock
+     * @param GetAssignedSalesChannelsForStockInterface $getAssignedSalesChannelsForStock
      * @param StockRepository $stockRepository
      */
     public function __construct(
-        GetAssignedSalesChannelsForStockInterface $channelsByStock,
+        GetAssignedSalesChannelsForStockInterface $getAssignedSalesChannelsForStock,
         StockRepository $stockRepository
     ) {
-        $this->channelsByStock = $channelsByStock;
+        $this->getAssignedSalesChannelsForStock = $getAssignedSalesChannelsForStock;
         $this->stockRepository = $stockRepository;
     }
 
@@ -49,32 +47,30 @@ public function afterGetData(StockDataProvider $subject, array $data): array
     {
         if ('inventory_stock_form_data_source' === $subject->getName()) {
             foreach ($data as &$stockData) {
-                $stockData['sales_channels'] = $this->getSalesChannelsDataForStock($data);
+                $stockData['sales_channels'] = $this->getSalesChannelsDataForStock($stockData['general']);
             }
             unset($stockData);
         } elseif ($data['totalRecords'] > 0) {
             foreach ($data['items'] as &$stockData) {
-                $stockData['sales_channels'] = $this->getSalesChannelsDataForStock($data);
+                $stockData['sales_channels'] = $this->getSalesChannelsDataForStock($stockData);
             }
             unset($stockData);
         }
         return $data;
     }
 
     /**
-     * @param bool $data
+     * @param array $stock
      * @return array
      */
-    private function getSalesChannelsDataForStock($data): array
+    private function getSalesChannelsDataForStock(array $stock): array
     {
-        $stockData = [];
-        foreach ($data['items'] as $stock) {
-            foreach ($stock['extension_attributes'] as $salesChannels) {
-                foreach ($salesChannels as $salesChannel) {
-                    $stockData[$salesChannel['type']][] = $salesChannel['code'];
-                }
+        $salesChannelsData = [];
+        foreach ($stock['extension_attributes'] as $salesChannels) {
+            foreach ($salesChannels as $salesChannel) {
+                $salesChannelsData[$salesChannel['type']][] = $salesChannel['code'];
             }
         }
-        return $stockData;
+        return $salesChannelsData;
     }
 }

app/code/Magento/InventorySales/Ui/Component/Listing/Column/SalesChannels.php

@@ -7,7 +7,7 @@
 
 namespace Magento\InventorySales\Ui\Component\Listing\Column;
 
-use Magento\InventorySales\Ui\SalesChannelNameResolver;
+use Magento\InventorySales\Ui\SalesChannelNameResolverInterface;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
@@ -18,45 +18,46 @@
 class SalesChannels extends Column
 {
     /**
-     * @var SalesChannelNameResolver
+     * @var SalesChannelNameResolverInterface
      */
     private $salesChannelNameResolver;
 
     /**
-     * SalesChannels constructor.
-     * @param SalesChannelNameResolver $salesChannelNameResolver
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
+     * @param SalesChannelNameResolverInterface $salesChannelNameResolver
      * @param array $components
      * @param array $data
      */
     public function __construct(
-        SalesChannelNameResolver $salesChannelNameResolver,
         ContextInterface $context,
         UiComponentFactory $uiComponentFactory,
+        SalesChannelNameResolverInterface $salesChannelNameResolver,
         array $components = [],
         array $data = []
     ) {
-        $this->salesChannelNameResolver = $salesChannelNameResolver;
         parent::__construct($context, $uiComponentFactory, $components, $data);
+        $this->salesChannelNameResolver = $salesChannelNameResolver;
     }
 
     /**
-     * Prepare column value
+     * Prepare sales value
      *
      * @param array $salesChannelData
      * @return array
      */
     private function prepareSalesChannelData(array $salesChannelData): array
     {
-        $refactoredChannelData = [];
+        $preparedChannelData = [];
         foreach ($salesChannelData as $type => $salesChannel) {
             foreach ($salesChannel as $key => $code) {
-                $refactoredChannelData[$type][$key]['name'] = $this->salesChannelNameResolver->resolve($type, $code);
-                $refactoredChannelData[$type][$key]['code'] = $code;
+                $preparedChannelData[$type][$key] = [
+                    'name' => $this->salesChannelNameResolver->resolve($type, $code),
+                    'code' => $code,
+                ];
             }
         }
-        return $refactoredChannelData;
+        return $preparedChannelData;
     }
 
     /**

app/code/Magento/InventorySales/Ui/SalesChannelNameResolverInterface.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventorySales\Ui;
+
+/**
+ * Resolve sales channel name by type and code
+ */
+interface SalesChannelNameResolverInterface
+{
+    /**
+     * Resolve sales channel name by type and code
+     *
+     * @param string $type
+     * @param string $code
+     * @return string
+     */
+    public function resolve(string $type, string $code): string;
+}

app/code/Magento/InventorySales/Ui/SalesChannelNameResolver.php renamed to app/code/Magento/InventorySales/Ui/WebsiteNameResolver.php

@@ -7,40 +7,35 @@
 
 namespace Magento\InventorySales\Ui;
 
+use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
 
 /**
- * Add grid column for sales channels
+ * {@inheritdoc}
+ *
+ * In default implementation works only with website
  */
-class SalesChannelNameResolver
+class WebsiteNameResolver implements SalesChannelNameResolverInterface
 {
     /**
      * @var WebsiteRepositoryInterface
      */
     private $websiteRepository;
 
     /**
-     * SalesChannelNameResolver constructor.
      * @param WebsiteRepositoryInterface $websiteRepository
      */
     public function __construct(
         WebsiteRepositoryInterface $websiteRepository
-    )
-    {
+    ) {
         $this->websiteRepository = $websiteRepository;
     }
 
     /**
-     * resolve the name by providing the code
-     *
-     * @param string $type
-     * @param string $code
-     * @return string
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @inheritdoc
      */
     public function resolve(string $type, string $code): string
     {
-        $name = $this->websiteRepository->get($code)->getName();
-        return $name;
+        return SalesChannelInterface::TYPE_WEBSITE === $code ? $this->websiteRepository->get($code)->getName() : $code;
     }
 }

app/code/Magento/InventorySales/etc/di.xml

@@ -10,13 +10,13 @@
     <preference for="Magento\InventorySalesApi\Api\Data\SalesChannelInterface" type="Magento\InventorySales\Model\SalesChannel"/>
     <preference for="Magento\InventorySales\Model\GetAssignedSalesChannelsForStockInterface" type="Magento\InventorySales\Model\GetAssignedSalesChannelsForStock"/>
     <preference for="Magento\InventorySales\Model\ReplaceSalesChannelsForStockInterface" type="Magento\InventorySales\Model\ResourceModel\ReplaceSalesChannelsDataForStock"/>
+    <preference for="Magento\InventorySales\Ui\SalesChannelNameResolverInterface" type="Magento\InventorySales\Ui\WebsiteNameResolver"/>
     <type name="Magento\InventoryApi\Api\StockRepositoryInterface">
         <plugin name="load_sales_channels_on_get_list" type="Magento\InventorySales\Plugin\Inventory\StockRepository\LoadSalesChannelsOnGetListPlugin"/>
         <plugin name="load_sales_channels_on_get" type="Magento\InventorySales\Plugin\Inventory\StockRepository\LoadSalesChannelsOnGetPlugin"/>
         <plugin name="save_sales_channels_links" type="Magento\InventorySales\Plugin\Inventory\StockRepository\SaveSalesChannelsLinksPlugin"/>
     </type>
     <type name="Magento\Inventory\Ui\DataProvider\StockDataProvider">
         <plugin name="sales_channel_data" type="Magento\InventorySales\Plugin\Inventory\Ui\StockDataProvider\SalesChannels" />
-        <plugin name="data_after_saveplugin" type="Magento\InventorySales\Plugin\Inventory\StockRepository\SalesChannel\SaveSalesChannelsLinksPlugin" />
     </type>
 </config>

app/code/Magento/InventorySales/view/adminhtml/ui_component/inventory_stock_form.xml

@@ -18,7 +18,7 @@
             <opened>true</opened>
             <dataScope>sales_channels</dataScope>
         </settings>
-        <field name="websites" formElement="multiselect" sortOrder="20">
+        <field name="website" formElement="multiselect" sortOrder="20">
             <settings>
                 <dataType>text</dataType>
                 <label translate="true">Websites</label>

app/code/Magento/InventorySales/view/adminhtml/ui_component/inventory_stock_listing.xml

@@ -10,7 +10,7 @@
         <column name="sales_channels"
                 class="Magento\InventorySales\Ui\Component\Listing\Column\SalesChannels"
                 component="Magento_InventorySales/js/stock/grid/cell/sales-channels"
-                sortOrder="30">
+                sortOrder="40">
             <settings>
                 <label translate="true">Sales Channels</label>
             </settings>