From ef6f15fd3fe7a9fb3cc6fec450315776d7ca6599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szyma=C5=84ski?=
 <bartlomiej.szymanski@bold.net.pl>
Date: Tue, 21 Nov 2017 20:41:57 +0100
Subject: [PATCH] Broken modularity in InventoryCatalog

---
 .../Magento/InventoryCatalog/etc/adminhtml/di.xml |  6 ------
 .../Ui/Component/Control/Stock/DeleteButton.php   |  2 +-
 .../Magento/InventorySales/etc/adminhtml/di.xml   | 15 +++++++++++++++
 .../ui_component/inventory_stock_form.xml         |  5 +++++
 4 files changed, 21 insertions(+), 7 deletions(-)
 rename app/code/Magento/{InventoryCatalog => InventorySales}/Ui/Component/Control/Stock/DeleteButton.php (97%)
 create mode 100644 app/code/Magento/InventorySales/etc/adminhtml/di.xml

diff --git a/app/code/Magento/InventoryCatalog/etc/adminhtml/di.xml b/app/code/Magento/InventoryCatalog/etc/adminhtml/di.xml
index 0f908d22e38b..2a88a440eb71 100644
--- a/app/code/Magento/InventoryCatalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/InventoryCatalog/etc/adminhtml/di.xml
@@ -6,12 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <!-- Stock delete button -->
-    <type name="Magento\InventoryCatalog\Ui\Component\Control\Stock\DeleteButton">
-        <arguments>
-            <argument name="deleteButton" xsi:type="object">Magento\Inventory\Ui\Component\Control\Stock\DeleteButton</argument>
-        </arguments>
-    </type>
     <!-- Product form configurations -->
     <virtualType name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Pool">
         <arguments>
diff --git a/app/code/Magento/InventoryCatalog/Ui/Component/Control/Stock/DeleteButton.php b/app/code/Magento/InventorySales/Ui/Component/Control/Stock/DeleteButton.php
similarity index 97%
rename from app/code/Magento/InventoryCatalog/Ui/Component/Control/Stock/DeleteButton.php
rename to app/code/Magento/InventorySales/Ui/Component/Control/Stock/DeleteButton.php
index f9e20031d3b8..0e3a62a1b2f7 100644
--- a/app/code/Magento/InventoryCatalog/Ui/Component/Control/Stock/DeleteButton.php
+++ b/app/code/Magento/InventorySales/Ui/Component/Control/Stock/DeleteButton.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\InventoryCatalog\Ui\Component\Control\Stock;
+namespace Magento\InventorySales\Ui\Component\Control\Stock;
 
 use Magento\Backend\Ui\Component\Control\DeleteButton as StockDeleteButton;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
diff --git a/app/code/Magento/InventorySales/etc/adminhtml/di.xml b/app/code/Magento/InventorySales/etc/adminhtml/di.xml
new file mode 100644
index 000000000000..e122d8aaa52f
--- /dev/null
+++ b/app/code/Magento/InventorySales/etc/adminhtml/di.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <!-- Stock delete button -->
+    <type name="Magento\InventorySales\Ui\Component\Control\Stock\DeleteButton">
+        <arguments>
+            <argument name="deleteButton" xsi:type="object">Magento\Inventory\Ui\Component\Control\Stock\DeleteButton</argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/InventorySales/view/adminhtml/ui_component/inventory_stock_form.xml b/app/code/Magento/InventorySales/view/adminhtml/ui_component/inventory_stock_form.xml
index 4312e5ca7e5f..b2d779e63f83 100644
--- a/app/code/Magento/InventorySales/view/adminhtml/ui_component/inventory_stock_form.xml
+++ b/app/code/Magento/InventorySales/view/adminhtml/ui_component/inventory_stock_form.xml
@@ -6,6 +6,11 @@
  */
 -->
 <form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <settings>
+        <buttons>
+            <button name="delete" class="Magento\InventorySales\Ui\Component\Control\Stock\DeleteButton"/>
+        </buttons>
+    </settings>
     <fieldset name="sales_channels" sortOrder="30">
         <settings>
             <label translate="true">Sales Channels</label>