MC-42779: Error on page builder when adding products for users not having admin access

Author: thiaramus

app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml

@@ -84,25 +84,6 @@
             <item name="Magento_PageBuilder::templates">Magento_PageBuilder::templates</item>
         </array>
     </entity>
-    <entity name="rolePageBuilderProductWidgetEdit" type="user_role" extends="adminRestrictedProductRole">
-        <data key="name" unique="suffix">Role_Page_Builder_Product_Widget_</data>
-        <data key="rolename" unique="suffix">Role_Page_Builder_Product_Widget_</data>
-        <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
-        <data key="all">0</data>
-        <data key="gws_is_all">0</data>
-        <array key="gws_websites">
-            <item>1</item>
-        </array>
-        <array key="resource">
-            <item name="Magento_Backend::dashboard">Magento_Backend::dashboard</item>
-            <item name="Magento_Backend::content">Magento_Backend::content</item>
-            <item name="Magento_Backend::content_elements">Magento_Backend::content_elements</item>
-            <item name="Magento_Cms::page">Magento_Cms::page</item>
-            <item name="Magento_Cms::save">Magento_Cms::save</item>
-            <item name="Magento_Cms::save_design">Magento_Cms::save_design</item>
-            <item name="Magento_Widget::widget_instance">Magento_Widget::widget_instance</item>
-        </array>
-    </entity>
     <entity name="rolePageBuilderSaveTemplates" type="user_role" extends="adminRestrictedProductRole">
         <data key="name" unique="suffix">Role_Page_Builder_Save_Templates_</data>
         <data key="rolename" unique="suffix">Role_Page_Builder_Save_Templates_</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselDisplayProductCountForRestrictedAdminTest.xml

@@ -23,21 +23,23 @@
 
         <before>
             <!-- Create a restricted role with access only to CMS and Widgets -->
-            <createData entity="rolePageBuilderProductWidgetEdit" after="createCMSPage" stepKey="createRestrictedRole"/>
+            <actionGroup ref="AdminCreateRoleActionGroup" after="loginAsAdmin" stepKey="createRestrictedRole">
+                <argument name="restrictedRole" value="Content"/>
+                <argument name="User" value="adminRole"/>
+            </actionGroup>
 
             <!-- Create an restricted admin user assigned to role -->
-            <actionGroup ref="AdminCreateUserWithApiRoleActionGroup" after="loginAsAdmin" stepKey="adminCreateUser">
-                <argument name="user" value="NewAdminUser"/>
-                <argument name="role" value="rolePageBuilderProductWidgetEdit"/>
+            <actionGroup ref="AdminCreateUserActionGroup" after="createRestrictedRole" stepKey="adminCreateUser">
+                <argument name="role" value="adminRole"/>
             </actionGroup>
 
             <!-- Log out main Admin user -->
             <actionGroup ref="AdminLogoutActionGroup" after="adminCreateUser" stepKey="adminLogout"/>
 
             <!-- Log in restricted Admin user -->
             <actionGroup ref="AdminLoginActionGroup" after="adminLogout" stepKey="loginAsRestrictedAdmin">
-                <argument name="username" value="{{NewAdminUser.username}}"/>
-                <argument name="password" value="{{NewAdminUser.password}}"/>
+                <argument name="username" value="{{newAdmin.username}}"/>
+                <argument name="password" value="{{newAdmin.password}}"/>
             </actionGroup>
         </before>
 
@@ -47,12 +49,12 @@
 
             <!-- Delete restricted Admin user -->
             <actionGroup ref="AdminDeleteCustomUserActionGroup" after="loginAsAdmin" stepKey="deleteUser">
-                <argument name="user" value="NewAdminUser"/>
+                <argument name="user" value="newAdmin"/>
             </actionGroup>
 
             <!-- Delete restricted role -->
-            <actionGroup ref="AdminDeleteRoleByRoleNameActionGroup" after="deleteUser" stepKey="deleteRestrictedRole">
-                <argument name="role" value="rolePageBuilderProductWidgetEdit"/>
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" after="deleteUser" stepKey="deleteRestrictedRole">
+                <argument name="roleName" value="{{adminRole.name}}"/>
             </actionGroup>
 
             <!-- Log out the restricted Admin User -->