MC-32547: Error when adding product as button link in Pagebuilder

Author: nikita-shcherbatykh

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

@@ -1160,6 +1160,7 @@ define([
 
             if (this.isSearchKeyCached(searchKey)) {
                 cachedSearchResult = this.getCachedSearchResults(searchKey);
+                this.cacheOptions.plain = cachedSearchResult.options;
                 this.options(cachedSearchResult.options);
                 this.afterLoadOptions(searchKey, cachedSearchResult.lastPage, cachedSearchResult.total);
 
@@ -1274,6 +1275,7 @@ define([
             });
 
             this.total = response.total;
+            this.cacheOptions.plain = existingOptions;
             this.options(existingOptions);
         },
 

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js

@@ -624,6 +624,24 @@ define([
                 expect(obj.options).toHaveBeenCalledWith([]);
                 expect(obj.processRequest).toHaveBeenCalledWith(searchKey, 1);
             });
+            it('Should update cacheOptions if response was cached', function () {
+                var searchKey = 'cake',
+                    searchResult = 'piece a cake';
+
+                obj.deviation = 30;
+                obj.cachedSearchResults = {
+                    cake: {
+                        options: [searchResult],
+                        lastPage: 1,
+                        total: 1
+                    }
+                };
+
+                spyOn(obj, 'options');
+                obj.loadOptions(searchKey);
+                expect(obj.options).toHaveBeenCalledWith([searchResult]);
+                expect(obj.cacheOptions.plain).toContain(searchResult);
+            });
         });
         describe('"isSearchKeyCached" method', function () {
             it('Should return false if searchKey has already been cached and total covers > 1 page', function () {
@@ -672,7 +690,7 @@ define([
             });
         });
         describe('"processRequest" method', function () {
-            it('Should store options successfully fetched from ajax request', function () {
+            it('Should store options and update cache successfully after fetched from ajax request', function () {
                 var ajaxRequest,
                     successfulAjaxResponse = {
                     options: {
@@ -686,14 +704,43 @@ define([
                     }
                 };
 
+                // place a number of options to cache prior fetch
+                obj.cacheOptions.plain = [{
+                    '2053': {
+                        value: '2057',
+                        label: 'testProductName5a8ddfd933b5c',
+                        'is_active': 1,
+                        path: 'testSku5a8ddfd933b5c',
+                        optgroup: false
+                    },
+                    '2054': {
+                        value: '2058',
+                        label: 'testProductName5a8ddfd933b5c',
+                        'is_active': 1,
+                        path: 'testSku5a8ddfd933b5c',
+                        optgroup: false
+                    }
+                }];
+
                 $.ajax = jasmine.createSpy().and.callFake(function (request) {
                     ajaxRequest = request.success.bind(obj);
                 });
 
                 expect(obj.processRequest()).toBeUndefined();
 
                 ajaxRequest(successfulAjaxResponse);
-                expect(JSON.stringify(obj.options())).toEqual(JSON.stringify([successfulAjaxResponse.options['2053']]));
+
+                expect(
+                    JSON.stringify(obj.options())
+                ).toEqual(
+                    JSON.stringify([successfulAjaxResponse.options['2053']])
+                );
+
+                expect(
+                    JSON.stringify(obj.cacheOptions.plain)
+                ).toEqual(
+                    JSON.stringify([successfulAjaxResponse.options['2053']])
+                );
             });
         });
     });