#39640: Completely removing a gallery-image from be keeps scope roles/types set (base/small/thumbnail) and after re-adding "old" roles/types appear

- rolled back a file that was changed by mistake for another issue

Author: pavel77718

app/code/Magento/Catalog/view/adminhtml/web/js/product-gallery.js

@@ -1,6 +1,6 @@
 /**
- * Copyright 2015 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 /**
@@ -355,11 +355,6 @@ define([
             imageData.isRemoved = true;
             $imageContainer.addClass('removed').hide().find('.is-removed').val(1);
 
-            $.each(this.options.types, $.proxy(function (index, type) {
-                this.element.find('.image-' + type.code).val('no_selection');
-                this.options.types[index].value = 'no_selection';
-            }, this));
-
             this._contentUpdated();
         },
 

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 /**
@@ -691,12 +691,11 @@ define([
         processingAddChild: function (ctx, index, prop) {
             this.bubble('addChild', false);
 
-            if (this.relatedData.length && this.relatedData.length % this.pageSize === 0) {
-                this.pages(this.pages() + 1);
-                this.nextPage();
-            } else if (~~this.currentPage() !== this.pages()) {
-                this.currentPage(this.pages());
-            }
+            var newTotal = this.relatedData.length + 1;
+            var newPages = Math.ceil(newTotal / this.pageSize);
+
+            this.pages(newPages);
+            this.currentPage(newPages);
 
             this.addChild(ctx, index, prop);
         },