Sales channels saving

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

@@ -10,6 +10,7 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\EntityManager\EventManager;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -48,25 +49,33 @@ class Save extends Action
      */
     private $stockSourceLinkProcessor;
 
+    /**
+     * @var EventManager
+     */
+    private $eventManager;
+
     /**
      * @param Context $context
      * @param StockInterfaceFactory $stockFactory
      * @param StockRepositoryInterface $stockRepository
      * @param DataObjectHelper $sourceHydrator
      * @param StockSourceLinkProcessor $stockSourceLinkProcessor
+     * @param EventManager $eventManager
      */
     public function __construct(
         Context $context,
         StockInterfaceFactory $stockFactory,
         StockRepositoryInterface $stockRepository,
         DataObjectHelper $sourceHydrator,
-        StockSourceLinkProcessor $stockSourceLinkProcessor
+        StockSourceLinkProcessor $stockSourceLinkProcessor,
+        EventManager $eventManager
     ) {
         parent::__construct($context);
         $this->stockFactory = $stockFactory;
         $this->stockRepository = $stockRepository;
         $this->dataObjectHelper = $sourceHydrator;
         $this->stockSourceLinkProcessor = $stockSourceLinkProcessor;
+        $this->eventManager = $eventManager;
     }
 
     /**
@@ -126,6 +135,13 @@ private function processSave(array $requestData, int $stockId = null): int
             $stock = $this->stockRepository->get($stockId);
         }
         $this->dataObjectHelper->populateWithArray($stock, $requestData['general'], StockInterface::class);
+        $this->eventManager->dispatch(
+            'save_stock_controller_populate_stock_with_data',
+            [
+                'request_data' => $requestData,
+                'stock' => $stock,
+            ]
+        );
         $stockId = $this->stockRepository->save($stock);
 
         $assignedSources =

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/Observer/Stock/PopulateWithWebsiteSalesChannelsObserver.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventorySales\Observer\Stock;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Event\Observer as EventObserver;
+use Magento\InventoryApi\Api\Data\StockInterface;
+use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
+use Magento\InventorySalesApi\Api\Data\SalesChannelInterfaceFactory;
+
+/**
+ * Populate stock with sales channels during saving via controller
+ *
+ * This needs to be handled in dedicated observer, because there is no pre-defined way of making several API calls for
+ * Form submission handling
+ */
+class PopulateWithWebsiteSalesChannelsObserver implements ObserverInterface
+{
+    /**
+     * @var SalesChannelInterfaceFactory
+     */
+    private $salesChannelFactory;
+
+    /**
+     * @param SalesChannelInterfaceFactory $salesChannelFactory
+     */
+    public function __construct(SalesChannelInterfaceFactory $salesChannelFactory)
+    {
+        $this->salesChannelFactory = $salesChannelFactory;
+    }
+
+    /**
+     * Populate stock with sales channels during saving via controller
+     *
+     * @param EventObserver $observer
+     * @return void
+     */
+    public function execute(EventObserver $observer)
+    {
+        /** @var StockInterface $stock */
+        $stock = $observer->getEvent()->getStock();
+        $requestData = $observer->getEvent()->getRequestData();
+
+        $extensionAttributes = $stock->getExtensionAttributes();
+        $assignedSalesChannels = $extensionAttributes->getSalesChannels();
+
+        foreach ($assignedSalesChannels as $key => $assignedSalesChannel) {
+            if ($assignedSalesChannel->getType() === SalesChannelInterface::TYPE_WEBSITE) {
+                unset($assignedSalesChannels[$key]);
+            }
+        }
+
+        if (isset($requestData['sales_channels'][SalesChannelInterface::TYPE_WEBSITE])
+            && is_array($requestData['sales_channels'][SalesChannelInterface::TYPE_WEBSITE])
+        ) {
+            foreach ($requestData['sales_channels'][SalesChannelInterface::TYPE_WEBSITE] as $websiteCode) {
+                $assignedSalesChannels[] = $this->createSalesChannelByWebsiteCode($websiteCode);
+            }
+        }
+        $extensionAttributes->setSalesChannels($assignedSalesChannels);
+    }
+
+    /**
+     * Create the sales channel by given website code
+     *
+     * @param string $websiteCode
+     * @return SalesChannelInterface
+     */
+    private function createSalesChannelByWebsiteCode(string $websiteCode): SalesChannelInterface
+    {
+        $salesChannel = $this->salesChannelFactory->create();
+        $salesChannel->setCode($websiteCode);
+        $salesChannel->setType(SalesChannelInterface::TYPE_WEBSITE);
+        return $salesChannel;
+    }
+}

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

@@ -7,13 +7,37 @@
 
 namespace Magento\InventorySales\Plugin\Inventory\Ui\StockDataProvider;
 
+use Magento\CatalogInventory\Model\Stock\StockRepository;
 use Magento\Inventory\Ui\DataProvider\StockDataProvider;
+use Magento\InventorySales\Model\GetAssignedSalesChannelsForStockInterface;
 
 /**
  * Customize stock form. Add sales channels data
  */
 class SalesChannels
 {
+    /**
+     * @var GetAssignedSalesChannelsForStockInterface
+     */
+    private $getAssignedSalesChannelsForStock;
+
+    /**
+     * @var StockRepository
+     */
+    private $stockRepository;
+
+    /**
+     * @param GetAssignedSalesChannelsForStockInterface $getAssignedSalesChannelsForStock
+     * @param StockRepository $stockRepository
+     */
+    public function __construct(
+        GetAssignedSalesChannelsForStockInterface $getAssignedSalesChannelsForStock,
+        StockRepository $stockRepository
+    ) {
+        $this->getAssignedSalesChannelsForStock = $getAssignedSalesChannelsForStock;
+        $this->stockRepository = $stockRepository;
+    }
+
     /**
      * @param StockDataProvider $subject
      * @param array $data
@@ -23,26 +47,36 @@ 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();
+                $salesChannelsData = $this->getSalesChannelsDataForStock($stockData['general']);
+                if (count($salesChannelsData)) {
+                    $stockData['sales_channels'] = $salesChannelsData;
+                }
             }
             unset($stockData);
         } elseif ($data['totalRecords'] > 0) {
             foreach ($data['items'] as &$stockData) {
-                $stockData['sales_channels'] = $this->getSalesChannelsDataForStock();
+                $salesChannelsData = $this->getSalesChannelsDataForStock($stockData);
+                if (count($salesChannelsData)) {
+                    $stockData['sales_channels'] = $salesChannelsData;
+                }
             }
             unset($stockData);
         }
         return $data;
     }
 
     /**
+     * @param array $stock
      * @return array
      */
-    private function getSalesChannelsDataForStock(): array
+    private function getSalesChannelsDataForStock(array $stock): array
     {
-        // @todo: replace on real data
-        return [
-            'websites' => ['base'],
-        ];
+        $salesChannelsData = [];
+        foreach ($stock['extension_attributes'] as $salesChannels) {
+            foreach ($salesChannels as $salesChannel) {
+                $salesChannelsData[$salesChannel['type']][] = $salesChannel['code'];
+            }
+        }
+        return $salesChannelsData;
     }
 }

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

@@ -7,42 +7,74 @@
 
 namespace Magento\InventorySales\Ui\Component\Listing\Column;
 
+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;
 
 /**
- * Add grid column for sales channels
+ * Add grid column for sales channels. Prepare data
  */
 class SalesChannels extends Column
 {
     /**
-     * Prepare column value
-     *
-     * @param array $salesChannelData
-     * @return string
+     * @var SalesChannelNameResolverInterface
      */
-    private function prepareStockChannelData(array $salesChannelData)
-    {
-        $websiteData = '';
-        foreach ($salesChannelData as $key => $channelData) {
-            $websiteData .= $key . ': ' . implode(',', $channelData);
-        }
-        return $websiteData;
+    private $salesChannelNameResolver;
+
+    /**
+     * @param ContextInterface $context
+     * @param UiComponentFactory $uiComponentFactory
+     * @param SalesChannelNameResolverInterface $salesChannelNameResolver
+     * @param array $components
+     * @param array $data
+     */
+    public function __construct(
+        ContextInterface $context,
+        UiComponentFactory $uiComponentFactory,
+        SalesChannelNameResolverInterface $salesChannelNameResolver,
+        array $components = [],
+        array $data = []
+    ) {
+        parent::__construct($context, $uiComponentFactory, $components, $data);
+        $this->salesChannelNameResolver = $salesChannelNameResolver;
     }
 
     /**
-     * @inheritdoc
+     * Prepare data source
+     *
+     * @param array $dataSource
+     * @return array
      */
     public function prepareDataSource(array $dataSource)
     {
         if ($dataSource['data']['totalRecords'] > 0) {
             foreach ($dataSource['data']['items'] as &$row) {
-                if (isset($row['sales_channels'])) {
-                    $row['sales_channels'] = $this->prepareStockChannelData($row['sales_channels']);
-                }
+                $row['sales_channels'] = $this->prepareSalesChannelData($row['sales_channels']);
             }
         }
         unset($row);
 
         return $dataSource;
     }
+
+    /**
+     * Prepare sales value
+     *
+     * @param array $salesChannelData
+     * @return array
+     */
+    private function prepareSalesChannelData(array $salesChannelData): array
+    {
+        $preparedChannelData = [];
+        foreach ($salesChannelData as $type => $salesChannel) {
+            foreach ($salesChannel as $code) {
+                $preparedChannelData[$type][] = [
+                    'name' => $this->salesChannelNameResolver->resolve($type, $code),
+                    'code' => $code,
+                ];
+            }
+        }
+        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/WebsiteNameResolver.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventorySales\Ui;
+
+use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+
+/**
+ * {@inheritdoc}
+ *
+ * In default implementation works only with website
+ */
+class WebsiteNameResolver implements SalesChannelNameResolverInterface
+{
+    /**
+     * @var WebsiteRepositoryInterface
+     */
+    private $websiteRepository;
+
+    /**
+     * @param WebsiteRepositoryInterface $websiteRepository
+     */
+    public function __construct(
+        WebsiteRepositoryInterface $websiteRepository
+    ) {
+        $this->websiteRepository = $websiteRepository;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(string $type, string $code): string
+    {
+        return SalesChannelInterface::TYPE_WEBSITE === $type ? $this->websiteRepository->get($code)->getName() : $code;
+    }
+}