From 4a2051df61c9d7085d919b0f504786e850af0bdc Mon Sep 17 00:00:00 2001
From: Roman Glushko <r.glushko@atwix.com>
Date: Sat, 12 May 2018 16:08:00 +0300
Subject: [PATCH 1/3] #1116 Refactored modularity of the InventoryAdminUi
 module

---
 .../Model/OptionSource/CarrierSource.php                    | 2 +-
 .../Model/OptionSource/RegionSource.php                     | 2 +-
 .../InventoryAdminUi/Ui/Component/Listing/Column/Region.php | 2 +-
 app/code/Magento/InventoryAdminUi/etc/adminhtml/system.xml  | 2 +-
 app/code/Magento/InventoryAdminUi/etc/module.xml            | 6 +++++-
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename app/code/Magento/{Inventory => InventoryAdminUi}/Model/OptionSource/CarrierSource.php (95%)
 rename app/code/Magento/{Inventory => InventoryAdminUi}/Model/OptionSource/RegionSource.php (95%)

diff --git a/app/code/Magento/Inventory/Model/OptionSource/CarrierSource.php b/app/code/Magento/InventoryAdminUi/Model/OptionSource/CarrierSource.php
similarity index 95%
rename from app/code/Magento/Inventory/Model/OptionSource/CarrierSource.php
rename to app/code/Magento/InventoryAdminUi/Model/OptionSource/CarrierSource.php
index 8546ce906eeec..3e71861812966 100644
--- a/app/code/Magento/Inventory/Model/OptionSource/CarrierSource.php
+++ b/app/code/Magento/InventoryAdminUi/Model/OptionSource/CarrierSource.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Inventory\Model\OptionSource;
+namespace Magento\InventoryAdminUi\Model\OptionSource;
 
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Shipping\Model\Config;
diff --git a/app/code/Magento/Inventory/Model/OptionSource/RegionSource.php b/app/code/Magento/InventoryAdminUi/Model/OptionSource/RegionSource.php
similarity index 95%
rename from app/code/Magento/Inventory/Model/OptionSource/RegionSource.php
rename to app/code/Magento/InventoryAdminUi/Model/OptionSource/RegionSource.php
index e130068b13e5b..2d4b312033105 100644
--- a/app/code/Magento/Inventory/Model/OptionSource/RegionSource.php
+++ b/app/code/Magento/InventoryAdminUi/Model/OptionSource/RegionSource.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\Inventory\Model\OptionSource;
+namespace Magento\InventoryAdminUi\Model\OptionSource;
 
 use Magento\Directory\Model\ResourceModel\Region\CollectionFactory;
 use Magento\Framework\Data\OptionSourceInterface;
diff --git a/app/code/Magento/InventoryAdminUi/Ui/Component/Listing/Column/Region.php b/app/code/Magento/InventoryAdminUi/Ui/Component/Listing/Column/Region.php
index 4c10386b50e77..4826a36c25822 100644
--- a/app/code/Magento/InventoryAdminUi/Ui/Component/Listing/Column/Region.php
+++ b/app/code/Magento/InventoryAdminUi/Ui/Component/Listing/Column/Region.php
@@ -9,7 +9,7 @@
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Inventory\Model\OptionSource\RegionSource;
+use Magento\InventoryAdminUi\Model\OptionSource\RegionSource;
 use Magento\Ui\Component\Listing\Columns\Column;
 
 /**
diff --git a/app/code/Magento/InventoryAdminUi/etc/adminhtml/system.xml b/app/code/Magento/InventoryAdminUi/etc/adminhtml/system.xml
index b74d040677319..16236e9f85dea 100644
--- a/app/code/Magento/InventoryAdminUi/etc/adminhtml/system.xml
+++ b/app/code/Magento/InventoryAdminUi/etc/adminhtml/system.xml
@@ -16,7 +16,7 @@
                 </field>
                 <field id="inventory_source_default_carrier_config" type="multiselect" translate="label" sortOrder="100" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Specify Carriers</label>
-                    <source_model>Magento\Inventory\Model\OptionSource\CarrierSource</source_model>
+                    <source_model>Magento\InventoryAdminUi\Model\OptionSource\CarrierSource</source_model>
                     <can_be_empty>1</can_be_empty>
                     <comment>Use Ctrl+Click for check several values or uncheck value</comment>
                     <depends>
diff --git a/app/code/Magento/InventoryAdminUi/etc/module.xml b/app/code/Magento/InventoryAdminUi/etc/module.xml
index 58535effa5379..560a4ce716fbb 100644
--- a/app/code/Magento/InventoryAdminUi/etc/module.xml
+++ b/app/code/Magento/InventoryAdminUi/etc/module.xml
@@ -6,5 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_InventoryAdminUi" setup_version="1.0.0"/>
+    <module name="Magento_InventoryAdminUi" setup_version="1.0.0">
+        <sequence>
+            <module name="Magento_InventoryApi"/>
+        </sequence>
+    </module>
 </config>

From 960947206412abf0ed9dcbf370a6842a66ba0824 Mon Sep 17 00:00:00 2001
From: Roman Glushko <r.glushko@atwix.com>
Date: Sat, 12 May 2018 16:23:18 +0300
Subject: [PATCH 2/3] #1116 Cleaned up dependencies in composer.json

---
 app/code/Magento/InventoryAdminUi/composer.json  | 1 -
 app/code/Magento/InventoryAdminUi/etc/module.xml | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/code/Magento/InventoryAdminUi/composer.json b/app/code/Magento/InventoryAdminUi/composer.json
index 8b2c81cb62016..6bc336b060c21 100644
--- a/app/code/Magento/InventoryAdminUi/composer.json
+++ b/app/code/Magento/InventoryAdminUi/composer.json
@@ -5,7 +5,6 @@
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
         "magento/module-inventory-api": "*",
-        "magento/module-inventory": "*",
         "magento/module-backend": "*",
         "magento/module-shipping": "*",
         "magento/module-ui": "*"
diff --git a/app/code/Magento/InventoryAdminUi/etc/module.xml b/app/code/Magento/InventoryAdminUi/etc/module.xml
index 560a4ce716fbb..749a5b42db252 100644
--- a/app/code/Magento/InventoryAdminUi/etc/module.xml
+++ b/app/code/Magento/InventoryAdminUi/etc/module.xml
@@ -6,9 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_InventoryAdminUi" setup_version="1.0.0">
-        <sequence>
-            <module name="Magento_InventoryApi"/>
-        </sequence>
-    </module>
+    <module name="Magento_InventoryAdminUi" setup_version="1.0.0" />
 </config>

From 2744181cc926226e9d8ab9c2c028ec030ea50630 Mon Sep 17 00:00:00 2001
From: Igor Miniailo <iminiailo@magento.com>
Date: Sun, 13 May 2018 11:54:59 +0300
Subject: [PATCH 3/3] 1116: Fix Directory dependency in InventoryAdminUi module

---
 app/code/Magento/Inventory/composer.json        | 1 -
 app/code/Magento/InventoryAdminUi/composer.json | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Inventory/composer.json b/app/code/Magento/Inventory/composer.json
index 2a616138c3a49..2d9ede32a4a5b 100644
--- a/app/code/Magento/Inventory/composer.json
+++ b/app/code/Magento/Inventory/composer.json
@@ -5,7 +5,6 @@
         "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
         "magento/module-inventory-api": "*",
-        "magento/module-directory": "*",
         "magento/module-shipping": "*"
     },
     "type": "magento2-module",
diff --git a/app/code/Magento/InventoryAdminUi/composer.json b/app/code/Magento/InventoryAdminUi/composer.json
index 6bc336b060c21..e8b4779f88937 100644
--- a/app/code/Magento/InventoryAdminUi/composer.json
+++ b/app/code/Magento/InventoryAdminUi/composer.json
@@ -7,11 +7,9 @@
         "magento/module-inventory-api": "*",
         "magento/module-backend": "*",
         "magento/module-shipping": "*",
+        "magento/module-directory": "*",
         "magento/module-ui": "*"
     },
-    "suggest": {
-        "magento/module-directory": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",