Merge remote-tracking branch 'tango/MAGETWO-51023' into MAGETWO-51859

Author: Bohdan Korablov

app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php

@@ -443,9 +443,10 @@ protected function getRows()
                             'elementTmpl' => 'Magento_ConfigurableProduct/components/file-uploader',
                             'fileInputName' => 'image',
                             'isMultipleFiles' => false,
-                            'imports' => [
+                            'links' => [
                                 'thumbnailUrl' => '${$.provider}:${$.parentScope}.thumbnail_image',
-                                'thumbnail' => '${$.provider}:${$.parentScope}.thumbnail'
+                                'thumbnail' => '${$.provider}:${$.parentScope}.thumbnail',
+                                'smallImage' => '${$.provider}:${$.parentScope}.small_image',
                             ],
                             'uploaderConfig' => [
                                 'url' => $this->urlBuilder->addSessionParam()->getUrl(

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/file-uploader.js

@@ -13,6 +13,7 @@ define([
         actionsListOpened: false,
         thumbnailUrl: '',
         thumbnail: null,
+        smallImage: null,
         defaults: {
             fileInputName: ''
         },
@@ -23,7 +24,7 @@ define([
          * @returns {Object} Chainable.
          */
         initObservable: function () {
-            this._super().observe(['processedFile', 'actionsListOpened', 'thumbnailUrl', 'thumbnail']);
+            this._super().observe(['processedFile', 'actionsListOpened', 'thumbnailUrl', 'thumbnail', 'smallImage']);
 
             return this;
         },
@@ -89,6 +90,9 @@ define([
         deleteImage: function () {
             this.processedFile({});
             this.value(null);
+            this.thumbnail(null);
+            this.thumbnailUrl(null);
+            this.smallImage(null);
 
             return this;
         }