ENGCOM-982: [Forwardport] resolved default country selection issue while creating new customer … #5 #14204

 - Merge Pull Request #14204 from rostyslav-hymon/magento2:2.3-develop-PR-port-13024
 - Merged commits:
   1. 255b682
   2. e37ae24

Author: magento-engcom-team

app/code/Magento/Directory/Model/ResourceModel/Country/Collection.php

@@ -66,6 +66,10 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @since 100.1.0
      */
     protected $countriesWithNotRequiredStates;
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    private $storeManager;
 
     /**
      * Initialize dependencies.
@@ -83,6 +87,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param array $countriesWithNotRequiredStates
      * @param mixed $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     * @param \Magento\Store\Model\StoreManagerInterface|null $storeManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -98,7 +103,8 @@ public function __construct(
         \Magento\Framework\App\Helper\AbstractHelper $helperData,
         array $countriesWithNotRequiredStates = [],
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null,
+        \Magento\Store\Model\StoreManagerInterface $storeManager = null
     ) {
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);
         $this->_scopeConfig = $scopeConfig;
@@ -108,6 +114,9 @@ public function __construct(
         $this->_arrayUtils = $arrayUtils;
         $this->helperData = $helperData;
         $this->countriesWithNotRequiredStates = $countriesWithNotRequiredStates;
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(
+            \Magento\Store\Model\StoreManagerInterface::class
+        );
     }
 
     /**
@@ -273,6 +282,7 @@ public function toOptionArray($emptyLabel = ' ')
             $sort = [$name => $foregroundCountry] + $sort;
         }
         $isRegionVisible = (bool)$this->helperData->isShowNonRequiredState();
+
         $options = [];
         foreach ($sort as $label => $value) {
             $options = $this->addForegroundCountriesToOptionArray($emptyLabel, $options);
@@ -291,9 +301,36 @@ public function toOptionArray($emptyLabel = ' ')
             array_unshift($options, ['value' => '', 'label' => $emptyLabel]);
         }
 
+        $this->addDefaultCountryToOptions($options);
+
         return $options;
     }
 
+    /**
+     * Adds default country to options
+     *
+     * @param array $options
+     * @return void
+     */
+    private function addDefaultCountryToOptions(array &$options)
+    {
+        $defaultCountry = [];
+        foreach ($this->storeManager->getWebsites() as $website) {
+            $defaultCountryConfig = $this->_scopeConfig->getValue(
+                \Magento\Directory\Helper\Data::XML_PATH_DEFAULT_COUNTRY,
+                ScopeInterface::SCOPE_WEBSITES,
+                $website
+            );
+            $defaultCountry[$defaultCountryConfig][] = $website->getId();
+        }
+
+        foreach ($options as $key => $option) {
+            if (isset($defaultCountry[$option['value']])) {
+                $options[$key]['is_default'] = $defaultCountry[$option['value']];
+            }
+        }
+    }
+
     /**
      * Set foreground countries array
      *

app/code/Magento/Directory/Test/Unit/Model/ResourceModel/Country/CollectionTest.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Directory\Test\Unit\Model\ResourceModel\Country;
 
+use Magento\Store\Api\Data\WebsiteInterface;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -21,6 +23,11 @@ class CollectionTest extends \PHPUnit\Framework\TestCase
      */
     protected $scopeConfigMock;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManagerMock;
+
     protected function setUp()
     {
         $connection = $this->createMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class);
@@ -51,6 +58,7 @@ protected function setUp()
         $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
         $countryFactory = $this->createMock(\Magento\Directory\Model\ResourceModel\CountryFactory::class);
         $helperDataMock = $this->createMock(\Magento\Directory\Helper\Data::class);
+        $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $arguments = [
             'logger' => $logger,
@@ -61,7 +69,8 @@ protected function setUp()
             'scopeConfig' => $this->scopeConfigMock,
             'countryFactory' => $countryFactory,
             'resource' => $resource,
-            'helperData' => $helperDataMock
+            'helperData' => $helperDataMock,
+            'storeManager' => $this->storeManagerMock
         ];
         $this->_model = $objectManager
             ->getObject(\Magento\Directory\Model\ResourceModel\Country\Collection::class, $arguments);
@@ -76,6 +85,14 @@ protected function setUp()
      */
     public function testToOptionArray($optionsArray, $emptyLabel, $foregroundCountries, $expectedResults)
     {
+        $website1 = $this->createMock(WebsiteInterface::class);
+        $website1->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn(1);
+        $this->storeManagerMock->expects($this->once())
+            ->method('getWebsites')
+            ->willReturn([$website1]);
+
         foreach ($optionsArray as $itemData) {
             $this->_model->addItem(new \Magento\Framework\DataObject($itemData));
         }

app/code/Magento/Ui/view/base/web/js/form/element/country.js

@@ -28,7 +28,7 @@ define([
          * @param {String} field
          */
         filter: function (value, field) {
-            var result;
+            var result, defaultCountry, defaultValue;
 
             if (!field) { //validate field, if we are on update
                 field = this.filterBy.field;
@@ -46,6 +46,17 @@ define([
 
             this.setOptions(result);
             this.reset();
+
+            if (!this.value()) {
+                defaultCountry = _.filter(result, function (item) {
+                    return item['is_default'] && item['is_default'].includes(value);
+                });
+
+                if (defaultCountry.length) {
+                    defaultValue = defaultCountry.shift();
+                    this.value(defaultValue.value);
+                }
+            }
         }
     });
 });