From 930018320d024f00506b3e8b4a96ccc1cc98f37e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szyma=C5=84ski?=
 <bartlomiej.szymanski@bold.net.pl>
Date: Sun, 17 Sep 2017 15:29:18 +0200
Subject: [PATCH 1/5] Add possibility To Delete Stocks in Admin Panel

---
 .../Controller/Adminhtml/Stock/Delete.php     | 72 ++++++++++++++++++
 .../Controller/Adminhtml/Stock/Edit.php       |  1 -
 .../Controller/Adminhtml/Stock/MassDelete.php | 74 +++++++++++++++++++
 .../Component/Control/Stock/DeleteButton.php  | 61 +++++++++++++++
 .../Component/Control/Stock/GenericButton.php | 60 +++++++++++++++
 .../Ui/Component/MassAction/Filter.php        | 46 ++++++++++++
 .../ui_component/inventory_stock_form.xml     |  1 +
 .../ui_component/inventory_stock_listing.xml  | 21 +++++-
 8 files changed, 334 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php
 create mode 100644 app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php
 create mode 100644 app/code/Magento/Inventory/Ui/Component/Control/Stock/DeleteButton.php
 create mode 100644 app/code/Magento/Inventory/Ui/Component/Control/Stock/GenericButton.php
 create mode 100644 app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php

diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php
new file mode 100644
index 000000000000..a2849a2ff3f6
--- /dev/null
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php
@@ -0,0 +1,72 @@
+<?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\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\InventoryApi\Api\StockRepositoryInterface;
+use Magento\InventoryApi\Api\Data\StockInterface;
+
+/**
+ * Delete Controller
+ */
+class Delete extends Action
+{
+    /**
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+
+    /**
+     * @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()
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $stockId = $this->getRequest()->getParam(StockInterface::STOCK_ID);
+        if ($stockId === null) {
+            $this->messageManager->addErrorMessage(__('Wrong request.'));
+
+            return $resultRedirect->setPath('*/*');
+        }
+        try {
+            $this->stockRepository->deleteById($stockId);
+            $this->messageManager->addSuccessMessage(__('The Stock has been deleted.'));
+            $resultRedirect->setPath('*/*');
+        } catch (NoSuchEntityException $e) {
+            $this->messageManager->addErrorMessage(__('Stock with id "%1" does not exist.', $stockId));
+            $resultRedirect->setPath('*/*');
+        } catch (CouldNotDeleteException $e) {
+            $this->messageManager->addErrorMessage($e->getMessage());
+            $resultRedirect->setPath('*/*/edit', [
+                StockInterface::STOCK_ID => $stockId,
+                '_current' => true,
+            ]);
+        }
+
+        return $resultRedirect;
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php
index 84a77734a9e6..87d50b440e53 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php
@@ -49,7 +49,6 @@ 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')
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php
new file mode 100644
index 000000000000..ebff47d752e7
--- /dev/null
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php
@@ -0,0 +1,74 @@
+<?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\Inventory\Ui\Component\MassAction\Filter;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\InventoryApi\Api\StockRepositoryInterface;
+
+/**
+ * Delete Controller
+ */
+class MassDelete extends Action
+{
+    /**
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+
+    /**
+     * @var StockRepositoryInterface
+     */
+    private $stockRepository;
+
+    /**
+     * @var Filter
+     */
+    private $massActionFilter;
+
+    /**
+     * @param Context $context
+     * @param StockRepositoryInterface $stockRepository
+     * @param Filter $massActionFilter
+     */
+    public function __construct(
+        Context $context,
+        StockRepositoryInterface $stockRepository,
+        Filter $massActionFilter
+    ) {
+        parent::__construct($context);
+        $this->stockRepository = $stockRepository;
+        $this->massActionFilter = $massActionFilter;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute()
+    {
+        if ($this->getRequest()->isPost() !== true) {
+            $this->messageManager->addErrorMessage(__('Wrong request.'));
+
+            return $this->resultRedirectFactory->create()->setPath('*/*');
+        }
+        $deletedItemsCount = 0;
+        foreach ($this->massActionFilter->getIds() as $id) {
+            try {
+                $this->stockRepository->deleteById($id);
+                $deletedItemsCount++;
+            } catch (CouldNotDeleteException $e) {
+                $errorMessage = __('[ID: %1] ', $id) . $e->getMessage();
+                $this->messageManager->addErrorMessage($errorMessage);
+            }
+        }
+        $this->messageManager->addSuccessMessage(__('You deleted %1 Stock(s).', $deletedItemsCount));
+
+        return $this->resultRedirectFactory->create()->setPath('*/*');
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Inventory/Ui/Component/Control/Stock/DeleteButton.php b/app/code/Magento/Inventory/Ui/Component/Control/Stock/DeleteButton.php
new file mode 100644
index 000000000000..4756d39e6e22
--- /dev/null
+++ b/app/code/Magento/Inventory/Ui/Component/Control/Stock/DeleteButton.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Inventory\Ui\Component\Control\Stock;
+
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+use Magento\InventoryApi\Api\Data\StockInterface;
+
+/**
+ * Class DeleteButton
+ */
+class DeleteButton implements ButtonProviderInterface
+{
+    /**
+     * @var GenericButton
+     */
+    private $button;
+
+    /**
+     * DeleteButton constructor.
+     *
+     * @param GenericButton $button
+     */
+    public function __construct(GenericButton $button)
+    {
+        $this->button = $button;
+    }
+
+    /**
+     * Get stock delete button data such as label, css class, on click action and sort order
+     *
+     * @return array
+     */
+    public function getButtonData()
+    {
+        $data = [];
+        if ($this->button->getId()) {
+            $data = [
+                'label' => __('Delete Stock'),
+                'class' => 'delete',
+                'on_click' => 'deleteConfirm(\'' . __('Are you sure you want to delete this stock ?') . '\', \'' . $this->getDeleteUrl() . '\')',
+                'sort_order' => 20,
+            ];
+        }
+
+        return $data;
+    }
+
+    /**
+     * Get stock delete url
+     *
+     * @return string
+     */
+    public function getDeleteUrl()
+    {
+        return $this->button->getUrl('*/*/delete', [StockInterface::STOCK_ID => $this->button->getId()]);
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Inventory/Ui/Component/Control/Stock/GenericButton.php b/app/code/Magento/Inventory/Ui/Component/Control/Stock/GenericButton.php
new file mode 100644
index 000000000000..7daab6d61069
--- /dev/null
+++ b/app/code/Magento/Inventory/Ui/Component/Control/Stock/GenericButton.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Inventory\Ui\Component\Control\Stock;
+
+use Magento\InventoryApi\Api\Data\StockInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
+
+/**
+ * Class GenericButton
+ */
+class GenericButton
+{
+    /**
+     * @var \Magento\Framework\UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var HttpRequest
+     */
+    private $request;
+
+    /**
+     * @param UrlInterface $urlBuilder
+     * @param HttpRequest $request
+     */
+    public function __construct(UrlInterface $urlBuilder, HttpRequest $request)
+    {
+        $this->urlBuilder = $urlBuilder;
+        $this->request = $request;
+    }
+
+    /**
+     * Get stock id
+     *
+     * @return int|null
+     */
+    public function getId()
+    {
+        return $this->request->getParam(StockInterface::STOCK_ID) ?? null;
+    }
+
+    /**
+     * Get button url base on route and parameters
+     *
+     * @param   string $route
+     * @param   array $params
+     *
+     * @return  string
+     */
+    public function getUrl($route = '', $params = [])
+    {
+        return $this->urlBuilder->getUrl($route, $params);
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php b/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
new file mode 100644
index 000000000000..08e451b66b04
--- /dev/null
+++ b/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Inventory\Ui\Component\MassAction;
+
+use Magento\Ui\Component\MassAction\Filter as BaseFilter;
+use Magento\Framework\Api\Search\DocumentInterface;
+
+/**
+ * Class Filter
+ * @todo remove this class after code from Engine\MagentoFix\Ui\Component\MassAction\Filter would be deploy to
+ *       production
+ */
+class Filter
+{
+    /**
+     * @var BaseFilter
+     */
+    private $filter;
+
+    /**
+     * @param BaseFilter $filter
+     */
+    public function __construct(
+        BaseFilter $filter
+    ) {
+        $this->filter = $filter;
+    }
+
+    /**
+     * Get ids from search filter
+     *
+     * @return array
+     */
+    public function getIds()
+    {
+        $this->filter->applySelectionOnTargetProvider();
+
+        return array_map(function(DocumentInterface $item) {
+            return $item->getId();
+        }, $this->filter->getComponent()->getContext()->getDataProvider()->getSearchResult()->getItems());
+    }
+}
\ No newline at end of file
diff --git a/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_form.xml b/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_form.xml
index 8fd88706bcdd..50e3b47b127a 100644
--- a/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_form.xml
+++ b/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_form.xml
@@ -29,6 +29,7 @@
                 <class>reset</class>
                 <label translate="true">Reset</label>
             </button>
+            <button name="delete" class="Magento\Inventory\Ui\Component\Control\Stock\DeleteButton"/>
             <button name="save" class="Magento\Inventory\Ui\Component\Control\Stock\SaveSplitButton"/>
         </buttons>
     </settings>
diff --git a/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_listing.xml b/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_listing.xml
index abc7abaadb38..d8a6033eebb4 100644
--- a/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_listing.xml
+++ b/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_listing.xml
@@ -57,7 +57,26 @@
                 </templates>
             </settings>
         </filters>
-        <massaction/>
+        <massaction name="listing_massaction">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="component" xsi:type="string">Magento_Ui/js/grid/tree-massactions</item>
+                </item>
+            </argument>
+            <action name="delete">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="type" xsi:type="string">delete</item>
+                        <item name="label" xsi:type="string" translate="true">Delete</item>
+                        <item name="url" xsi:type="url" path="inventory/stock/massDelete"/>
+                        <item name="confirm" xsi:type="array">
+                            <item name="title" xsi:type="string" translate="true">Delete items</item>
+                            <item name="message" xsi:type="string" translate="true">Are you sure you want to delete selected items?</item>
+                        </item>
+                    </item>
+                </argument>
+            </action>
+        </massaction>
         <paging name="listing_paging"/>
     </listingToolbar>
     <columns name="inventory_stock_listing_columns">

From 44db36f41b83d6634e87d59e1a1a93f53332ca5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szyma=C5=84ski?=
 <bartlomiej.szymanski@bold.net.pl>
Date: Thu, 21 Sep 2017 22:10:21 +0200
Subject: [PATCH 2/5] Add link to issue

---
 .../Magento/Inventory/Ui/Component/MassAction/Filter.php  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php b/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
index 08e451b66b04..746336f00e1f 100644
--- a/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
@@ -11,8 +11,7 @@
 
 /**
  * Class Filter
- * @todo remove this class after code from Engine\MagentoFix\Ui\Component\MassAction\Filter would be deploy to
- *       production
+ * @see https://github.com/magento/magento2/issues/10988
  */
 class Filter
 {
@@ -38,9 +37,12 @@ public function __construct(
     public function getIds()
     {
         $this->filter->applySelectionOnTargetProvider();
+        $component = $this->filter->getComponent();
+        $dataProvider = $component->getContext()->getDataProvider();
+        $searchResult = $dataProvider->getSearchResult();
 
         return array_map(function(DocumentInterface $item) {
             return $item->getId();
-        }, $this->filter->getComponent()->getContext()->getDataProvider()->getSearchResult()->getItems());
+        }, $searchResult->getItems());
     }
 }
\ No newline at end of file

From 16bfd466b698f96187b7a514242be250d70e8434 Mon Sep 17 00:00:00 2001
From: Valeriy Nayda <vnayda@magento.com>
Date: Wed, 27 Sep 2017 14:20:54 +0300
Subject: [PATCH 3/5] MSI: Add possibility To Delete Stocks in Admin Panel

-- slight refactoring
---
 .../Ui/Component/Control/DeleteButton.php     | 93 +++++++++++++++++++
 .../Controller/Adminhtml/Source/Edit.php      |  2 +-
 .../Adminhtml/Source/InlineEdit.php           |  2 +-
 .../Controller/Adminhtml/Source/NewAction.php |  2 +-
 .../Controller/Adminhtml/Source/Save.php      |  2 +-
 .../Controller/Adminhtml/Stock/Delete.php     |  9 +-
 .../Controller/Adminhtml/Stock/Edit.php       |  3 +-
 .../Controller/Adminhtml/Stock/InlineEdit.php |  2 +-
 .../Controller/Adminhtml/Stock/MassDelete.php |  7 +-
 .../Controller/Adminhtml/Stock/NewAction.php  |  2 +-
 .../Controller/Adminhtml/Stock/Save.php       |  2 +-
 .../Component/Control/Stock/DeleteButton.php  | 61 ------------
 .../Component/Control/Stock/GenericButton.php | 60 ------------
 .../Ui/Component/MassAction/Filter.php        |  4 +-
 .../Magento/Inventory/etc/adminhtml/di.xml    |  8 ++
 .../ui_component/inventory_stock_listing.xml  | 27 ++----
 16 files changed, 129 insertions(+), 157 deletions(-)
 create mode 100644 app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php
 delete mode 100644 app/code/Magento/Inventory/Ui/Component/Control/Stock/DeleteButton.php
 delete mode 100644 app/code/Magento/Inventory/Ui/Component/Control/Stock/GenericButton.php

diff --git a/app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php b/app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php
new file mode 100644
index 000000000000..3a5875fd1a0f
--- /dev/null
+++ b/app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Ui\Component\Control;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * Represents delete button with pre-configured options
+ * Provide an ability to show confirmation message on click on the "Delete" button
+ *
+ * @api
+ */
+class DeleteButton implements ButtonProviderInterface
+{
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var string
+     */
+    private $confirmationMessage;
+
+    /**
+     * @var string
+     */
+    private $idFieldName;
+
+    /**
+     * @var string
+     */
+    private $deleteRoutePath;
+
+    /**
+     * @var int
+     */
+    private $sortOrder;
+
+    /**
+     * @param RequestInterface $request
+     * @param UrlInterface $urlBuilder
+     * @param string $confirmationMessage
+     * @param string $idFieldName
+     * @param string $deleteRoutePath
+     * @param int $sortOrder
+     */
+    public function __construct(
+        RequestInterface $request,
+        UrlInterface $urlBuilder,
+        string $confirmationMessage,
+        string $idFieldName,
+        string $deleteRoutePath,
+        int $sortOrder
+    ) {
+        $this->request = $request;
+        $this->urlBuilder = $urlBuilder;
+        $this->confirmationMessage = $confirmationMessage;
+        $this->idFieldName = $idFieldName;
+        $this->deleteRoutePath = $deleteRoutePath;
+        $this->sortOrder = $sortOrder;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getButtonData()
+    {
+        $data = [];
+        $id = $this->request->getParam($this->idFieldName);
+        if (null !== $id) {
+            $url = $this->urlBuilder->getUrl($this->deleteRoutePath);
+            $data = [
+                'label' => __('Delete'),
+                'class' => 'delete',
+                'on_click' =>
+                    "deleteConfirm('{$this->confirmationMessage}', '{$url}', {data:{{$this->idFieldName}:{$id}}})",
+                'sort_order' => $this->sortOrder,
+            ];
+        }
+        return $data;
+    }
+}
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php b/app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php
index f795da5c2dc2..819a21271e27 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php
@@ -22,7 +22,7 @@ class Edit extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Inventory::source';
+    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
 
     /**
      * @var SourceRepositoryInterface
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php b/app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php
index 22e26317a214..b4597e43d574 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php
@@ -23,7 +23,7 @@ class InlineEdit extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Inventory::source';
+    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
 
     /**
      * @var DataObjectHelper
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Source/NewAction.php b/app/code/Magento/Inventory/Controller/Adminhtml/Source/NewAction.php
index 94d9a260713c..b80224ed1722 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Source/NewAction.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Source/NewAction.php
@@ -18,7 +18,7 @@ class NewAction extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Inventory::source';
+    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
 
     /**
      * @inheritdoc
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php b/app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php
index 253fe8510dcf..1fde2b3cfbed 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php
@@ -24,7 +24,7 @@ class Save extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Inventory::source';
+    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
 
     /**
      * @var SourceInterfaceFactory
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php
index a2849a2ff3f6..aee42eed8284 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Inventory\Controller\Adminhtml\Stock;
 
 use Magento\Backend\App\Action;
@@ -46,12 +45,13 @@ public function __construct(
     public function execute()
     {
         $resultRedirect = $this->resultRedirectFactory->create();
-        $stockId = $this->getRequest()->getParam(StockInterface::STOCK_ID);
+
+        $stockId = $this->getRequest()->getPost(StockInterface::STOCK_ID);
         if ($stockId === null) {
             $this->messageManager->addErrorMessage(__('Wrong request.'));
-
             return $resultRedirect->setPath('*/*');
         }
+
         try {
             $this->stockRepository->deleteById($stockId);
             $this->messageManager->addSuccessMessage(__('The Stock has been deleted.'));
@@ -66,7 +66,6 @@ public function execute()
                 '_current' => true,
             ]);
         }
-
         return $resultRedirect;
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php
index 87d50b440e53..3224e65cfa7e 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php
@@ -22,7 +22,7 @@ class Edit extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
+    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
 
     /**
      * @var StockRepositoryInterface
@@ -49,6 +49,7 @@ 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')
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/InlineEdit.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/InlineEdit.php
index 50ac1720da26..b99b2a39277e 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/InlineEdit.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/InlineEdit.php
@@ -23,7 +23,7 @@ class InlineEdit extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
+    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
 
     /**
      * @var DataObjectHelper
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php
index ebff47d752e7..f2aaf43ba2f7 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Inventory\Controller\Adminhtml\Stock;
 
 use Magento\Backend\App\Action;
@@ -13,7 +12,7 @@
 use Magento\InventoryApi\Api\StockRepositoryInterface;
 
 /**
- * Delete Controller
+ * MassDelete Controller
  */
 class MassDelete extends Action
 {
@@ -54,9 +53,9 @@ public function execute()
     {
         if ($this->getRequest()->isPost() !== true) {
             $this->messageManager->addErrorMessage(__('Wrong request.'));
-
             return $this->resultRedirectFactory->create()->setPath('*/*');
         }
+
         $deletedItemsCount = 0;
         foreach ($this->massActionFilter->getIds() as $id) {
             try {
@@ -71,4 +70,4 @@ public function execute()
 
         return $this->resultRedirectFactory->create()->setPath('*/*');
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/NewAction.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/NewAction.php
index 81b4cbf8a5f0..98045b26e61a 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/NewAction.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/NewAction.php
@@ -18,7 +18,7 @@ class NewAction extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
+    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
 
     /**
      * @inheritdoc
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php
index 07de43a913ee..41090b892288 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php
@@ -26,7 +26,7 @@ class Save extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
+    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
 
     /**
      * @var StockInterfaceFactory
diff --git a/app/code/Magento/Inventory/Ui/Component/Control/Stock/DeleteButton.php b/app/code/Magento/Inventory/Ui/Component/Control/Stock/DeleteButton.php
deleted file mode 100644
index 4756d39e6e22..000000000000
--- a/app/code/Magento/Inventory/Ui/Component/Control/Stock/DeleteButton.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Inventory\Ui\Component\Control\Stock;
-
-use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
-use Magento\InventoryApi\Api\Data\StockInterface;
-
-/**
- * Class DeleteButton
- */
-class DeleteButton implements ButtonProviderInterface
-{
-    /**
-     * @var GenericButton
-     */
-    private $button;
-
-    /**
-     * DeleteButton constructor.
-     *
-     * @param GenericButton $button
-     */
-    public function __construct(GenericButton $button)
-    {
-        $this->button = $button;
-    }
-
-    /**
-     * Get stock delete button data such as label, css class, on click action and sort order
-     *
-     * @return array
-     */
-    public function getButtonData()
-    {
-        $data = [];
-        if ($this->button->getId()) {
-            $data = [
-                'label' => __('Delete Stock'),
-                'class' => 'delete',
-                'on_click' => 'deleteConfirm(\'' . __('Are you sure you want to delete this stock ?') . '\', \'' . $this->getDeleteUrl() . '\')',
-                'sort_order' => 20,
-            ];
-        }
-
-        return $data;
-    }
-
-    /**
-     * Get stock delete url
-     *
-     * @return string
-     */
-    public function getDeleteUrl()
-    {
-        return $this->button->getUrl('*/*/delete', [StockInterface::STOCK_ID => $this->button->getId()]);
-    }
-}
\ No newline at end of file
diff --git a/app/code/Magento/Inventory/Ui/Component/Control/Stock/GenericButton.php b/app/code/Magento/Inventory/Ui/Component/Control/Stock/GenericButton.php
deleted file mode 100644
index 7daab6d61069..000000000000
--- a/app/code/Magento/Inventory/Ui/Component/Control/Stock/GenericButton.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-namespace Magento\Inventory\Ui\Component\Control\Stock;
-
-use Magento\InventoryApi\Api\Data\StockInterface;
-use Magento\Framework\UrlInterface;
-use Magento\Framework\App\Request\Http as HttpRequest;
-
-/**
- * Class GenericButton
- */
-class GenericButton
-{
-    /**
-     * @var \Magento\Framework\UrlInterface
-     */
-    private $urlBuilder;
-
-    /**
-     * @var HttpRequest
-     */
-    private $request;
-
-    /**
-     * @param UrlInterface $urlBuilder
-     * @param HttpRequest $request
-     */
-    public function __construct(UrlInterface $urlBuilder, HttpRequest $request)
-    {
-        $this->urlBuilder = $urlBuilder;
-        $this->request = $request;
-    }
-
-    /**
-     * Get stock id
-     *
-     * @return int|null
-     */
-    public function getId()
-    {
-        return $this->request->getParam(StockInterface::STOCK_ID) ?? null;
-    }
-
-    /**
-     * Get button url base on route and parameters
-     *
-     * @param   string $route
-     * @param   array $params
-     *
-     * @return  string
-     */
-    public function getUrl($route = '', $params = [])
-    {
-        return $this->urlBuilder->getUrl($route, $params);
-    }
-}
\ No newline at end of file
diff --git a/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php b/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
index 746336f00e1f..a444eaf92c80 100644
--- a/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
@@ -3,14 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Inventory\Ui\Component\MassAction;
 
 use Magento\Ui\Component\MassAction\Filter as BaseFilter;
 use Magento\Framework\Api\Search\DocumentInterface;
 
 /**
- * Class Filter
+ * Temporary solution
+ * @todo Need to remove after fixing the issue
  * @see https://github.com/magento/magento2/issues/10988
  */
 class Filter
diff --git a/app/code/Magento/Inventory/etc/adminhtml/di.xml b/app/code/Magento/Inventory/etc/adminhtml/di.xml
index 1d929d98399f..44ee631ed0bf 100644
--- a/app/code/Magento/Inventory/etc/adminhtml/di.xml
+++ b/app/code/Magento/Inventory/etc/adminhtml/di.xml
@@ -17,6 +17,14 @@
             <argument name="saveTarget" xsi:type="string">inventory_stock_form.inventory_stock_form</argument>
         </arguments>
     </virtualType>
+    <virtualType name="Magento\Inventory\Ui\Component\Control\Stock\DeleteButton" type="Magento\Backend\Ui\Component\Control\DeleteButton">
+        <arguments>
+            <argument name="confirmationMessage" xsi:type="string" translate="true">Are you sure you want to delete this stock?</argument>
+            <argument name="idFieldName" xsi:type="const">Magento\InventoryApi\Api\Data\StockInterface::STOCK_ID</argument>
+            <argument name="deleteRoutePath" xsi:type="string">*/*/delete</argument>
+            <argument name="sortOrder" xsi:type="number">30</argument>
+        </arguments>
+    </virtualType>
     <!-- Product form configurations -->
     <virtualType name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Pool">
         <arguments>
diff --git a/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_listing.xml b/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_listing.xml
index d8a6033eebb4..04001ecf931f 100644
--- a/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_listing.xml
+++ b/app/code/Magento/Inventory/view/adminhtml/ui_component/inventory_stock_listing.xml
@@ -57,24 +57,17 @@
                 </templates>
             </settings>
         </filters>
-        <massaction name="listing_massaction">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="component" xsi:type="string">Magento_Ui/js/grid/tree-massactions</item>
-                </item>
-            </argument>
+        <massaction name="listing_massaction" component="Magento_Ui/js/grid/tree-massactions">
             <action name="delete">
-                <argument name="data" xsi:type="array">
-                    <item name="config" xsi:type="array">
-                        <item name="type" xsi:type="string">delete</item>
-                        <item name="label" xsi:type="string" translate="true">Delete</item>
-                        <item name="url" xsi:type="url" path="inventory/stock/massDelete"/>
-                        <item name="confirm" xsi:type="array">
-                            <item name="title" xsi:type="string" translate="true">Delete items</item>
-                            <item name="message" xsi:type="string" translate="true">Are you sure you want to delete selected items?</item>
-                        </item>
-                    </item>
-                </argument>
+                <settings>
+                    <confirm>
+                        <message translate="true">Delete selected items?</message>
+                        <title translate="true">Delete items</title>
+                    </confirm>
+                    <url path="inventory/stock/massDelete"/>
+                    <type>delete</type>
+                    <label translate="true">Delete</label>
+                </settings>
             </action>
         </massaction>
         <paging name="listing_paging"/>

From a2697d72e94e0c96f0bc0c6346a387ade8b7eee3 Mon Sep 17 00:00:00 2001
From: Valeriy Nayda <vnayda@magento.com>
Date: Wed, 27 Sep 2017 14:33:47 +0300
Subject: [PATCH 4/5] MSI: Add possibility To Delete Stocks in Admin Panel

-- slight refactoring
---
 app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php | 2 +-
 .../Inventory/Controller/Adminhtml/Source/InlineEdit.php        | 2 +-
 .../Magento/Inventory/Controller/Adminhtml/Source/NewAction.php | 2 +-
 app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php | 2 +-
 .../Magento/Inventory/Controller/Adminhtml/Stock/Delete.php     | 2 +-
 app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php  | 2 +-
 .../Magento/Inventory/Controller/Adminhtml/Stock/InlineEdit.php | 2 +-
 .../Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php | 2 +-
 .../Magento/Inventory/Controller/Adminhtml/Stock/NewAction.php  | 2 +-
 app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php b/app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php
index 819a21271e27..f795da5c2dc2 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Source/Edit.php
@@ -22,7 +22,7 @@ class Edit extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+    const ADMIN_RESOURCE = 'Magento_Inventory::source';
 
     /**
      * @var SourceRepositoryInterface
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php b/app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php
index b4597e43d574..22e26317a214 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Source/InlineEdit.php
@@ -23,7 +23,7 @@ class InlineEdit extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+    const ADMIN_RESOURCE = 'Magento_Inventory::source';
 
     /**
      * @var DataObjectHelper
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Source/NewAction.php b/app/code/Magento/Inventory/Controller/Adminhtml/Source/NewAction.php
index b80224ed1722..94d9a260713c 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Source/NewAction.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Source/NewAction.php
@@ -18,7 +18,7 @@ class NewAction extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+    const ADMIN_RESOURCE = 'Magento_Inventory::source';
 
     /**
      * @inheritdoc
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php b/app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php
index 1fde2b3cfbed..253fe8510dcf 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Source/Save.php
@@ -24,7 +24,7 @@ class Save extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+    const ADMIN_RESOURCE = 'Magento_Inventory::source';
 
     /**
      * @var SourceInterfaceFactory
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php
index aee42eed8284..1f916618f0e4 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Delete.php
@@ -20,7 +20,7 @@ class Delete extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
 
     /**
      * @var StockRepositoryInterface
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php
index 3224e65cfa7e..84a77734a9e6 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Edit.php
@@ -22,7 +22,7 @@ class Edit extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
 
     /**
      * @var StockRepositoryInterface
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/InlineEdit.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/InlineEdit.php
index b99b2a39277e..50ac1720da26 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/InlineEdit.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/InlineEdit.php
@@ -23,7 +23,7 @@ class InlineEdit extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
 
     /**
      * @var DataObjectHelper
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php
index f2aaf43ba2f7..6fd7dd45f7b0 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/MassDelete.php
@@ -19,7 +19,7 @@ class MassDelete extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
 
     /**
      * @var StockRepositoryInterface
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/NewAction.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/NewAction.php
index 98045b26e61a..81b4cbf8a5f0 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/NewAction.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/NewAction.php
@@ -18,7 +18,7 @@ class NewAction extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
 
     /**
      * @inheritdoc
diff --git a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php
index 41090b892288..07de43a913ee 100644
--- a/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php
+++ b/app/code/Magento/Inventory/Controller/Adminhtml/Stock/Save.php
@@ -26,7 +26,7 @@ class Save extends Action
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = Index::ADMIN_RESOURCE;
+    const ADMIN_RESOURCE = 'Magento_Inventory::stock';
 
     /**
      * @var StockInterfaceFactory

From 67c06928c1b269c1e4066cf545cc74ce61796656 Mon Sep 17 00:00:00 2001
From: Valeriy Nayda <vnayda@magento.com>
Date: Wed, 27 Sep 2017 15:18:27 +0300
Subject: [PATCH 5/5] MSI: Add possibility To Delete Stocks in Admin Panel

-- code style fixes
---
 app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php b/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
index a444eaf92c80..c3d6133bb71e 100644
--- a/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
+++ b/app/code/Magento/Inventory/Ui/Component/MassAction/Filter.php
@@ -41,8 +41,8 @@ public function getIds()
         $dataProvider = $component->getContext()->getDataProvider();
         $searchResult = $dataProvider->getSearchResult();
 
-        return array_map(function(DocumentInterface $item) {
+        return array_map(function (DocumentInterface $item) {
             return $item->getId();
         }, $searchResult->getItems());
     }
-}
\ No newline at end of file
+}