Merge branch 'MAGETWO-38302' into PR-bugs

Author: slopok

app/code/Magento/Customer/view/base/ui_component/customer_form.xml

@@ -413,18 +413,6 @@
                 </item>
             </argument>
         </field>
-        <field name="country_id">
-            <argument name="data" xsi:type="array">
-                <item name="config" xsi:type="array">
-                    <item name="dataType" xsi:type="string">text</item>
-                    <item name="formElement" xsi:type="string">select</item>
-                    <item name="source" xsi:type="string">address</item>
-                    <item name="validation" xsi:type="array">
-                        <item name="required-entry" xsi:type="boolean">true</item>
-                    </item>
-                </item>
-            </argument>
-        </field>
         <field name="region">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
@@ -437,7 +425,6 @@
         </field>
         <field name="region_id">
             <argument name="data" xsi:type="array">
-                <item name="customEntry" xsi:type="string">region</item>
                 <item name="config" xsi:type="array">
                     <item name="dataType" xsi:type="string">text</item>
                     <item name="formElement" xsi:type="string">select</item>

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

@@ -47,8 +47,7 @@ define([
             _.bindAll(this, 'reset');
 
             this._super();
-
-            this.initialValue = this.getInititalValue();
+            this.initialValue = this.getInitialValue();
 
             this.value(this.initialValue);
 
@@ -97,7 +96,7 @@ define([
          *
          * @returns {*} Elements' value.
          */
-        getInititalValue: function () {
+        getInitialValue: function () {
             var values = [this.value(), this.default],
                 value;
 

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

@@ -13,7 +13,7 @@ define([
          *
          * @return {Boolean}
          */
-        getInititalValue: function () {
+        getInitialValue: function () {
             return !!+this._super();
         },
 

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

@@ -26,7 +26,7 @@ define([
          *
          * @returns {String}
          */
-        getInititalValue: function () {
+        getInitialValue: function () {
             var value = this._super();
 
             if (value) {

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

@@ -20,7 +20,7 @@ define([
          *
          * @returns {Number|String}
          */
-        getInititalValue: function () {
+        getInitialValue: function () {
             var value = this._super();
 
             return _.isString(value) ? value.split(',') : value;

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

@@ -14,9 +14,9 @@ define([
     var inputNode = {
         parent: '${ $.$data.parentName }',
         type: 'form.input',
-        name: '<%= $data.index %>_input',
-        dataScope: '<%= $data.customEntry %>',
-        customScope: '<%= $data.customScope %>',
+        name: '${ $.$data.index }_input',
+        dataScope: '${ $.$data.customEntry }',
+        customScope: '${ $.$data.customScope }',
         sortOrder: {
             after: '${ $.$data.name }'
         },
@@ -157,6 +157,7 @@ define([
         initFilter: function () {
             var filter = this.filterBy;
 
+            this.filter(this.default, filter.field);
             this.setLinks({
                 filter: filter.target
             }, 'imports');
@@ -181,7 +182,7 @@ define([
          *
          * @returns {Number|String}
          */
-        getInititalValue: function () {
+        getInitialValue: function () {
             var value = this._super();
 
             if (value !== '') {