MAGETWO-58896: Product Fields Auto-Generation does not work as expected

- Code review fixes

Author: undefined-olha

app/code/Magento/Catalog/view/adminhtml/web/js/components/import-handler.js

@@ -57,14 +57,14 @@ define([
             var string = this.mask || '',
                 nonEmptyValueFlag = false;
 
-            if (!this.allowImport) {
-                return;
-            }
-
             if (placeholder) {
                 this.values[placeholder] = component.getPreview() || '';
             }
 
+            if (!this.allowImport) {
+                return;
+            }
+
             _.each(this.values, function (propertyValue, propertyName) {
                 string = string.replace('{{' + propertyName + '}}', propertyValue);
                 nonEmptyValueFlag = nonEmptyValueFlag || !!propertyValue;
@@ -104,7 +104,7 @@ define([
                 this.allowImport = true;
 
                 if (this.autoImportIfEmpty) {
-                    this.updateValue(false, null);
+                    this.updateValue(null, null);
                 }
             } else {
                 this.allowImport = false;