Skip to content

Commit f656e45

Browse files
rostyslav-hymonrostyslav-hymon
committed
Merge remote-tracking branch 'origin/develop' into MC-34620
2 parents 0cb45f9 + f22afad commit f656e45

File tree

7 files changed

+63
-51
lines changed

7 files changed

+63
-51
lines changed

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

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<data key="created">Created</data>
5050
</entity>
5151
<!-- User Roles -->
52-
<entity name="roleNoPageBuilderTemplates" type="user_role">
52+
<entity name="roleNoPageBuilderTemplates" type="user_role" extends="adminRestrictedProductRole">
5353
<data key="name" unique="suffix">Role_Page_Builder_Templates_</data>
5454
<data key="rolename" unique="suffix">Role_Page_Builder_Templates_</data>
5555
<data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
@@ -59,14 +59,14 @@
5959
<item>1</item>
6060
</array>
6161
<array key="resource">
62-
<item>Magento_Backend::dashboard</item>
63-
<item>Magento_Backend::content</item>
64-
<item>Magento_Backend::content_elements</item>
65-
<item>Magento_Cms::page</item>
66-
<item>Magento_Cms::save</item>
62+
<item name="Magento_Backend::dashboard">Magento_Backend::dashboard</item>
63+
<item name="Magento_Backend::content">Magento_Backend::content</item>
64+
<item name="Magento_Backend::content_elements">Magento_Backend::content_elements</item>
65+
<item name="Magento_Cms::page">Magento_Cms::page</item>
66+
<item name="Magento_Cms::save">Magento_Cms::save</item>
6767
</array>
6868
</entity>
69-
<entity name="rolePageBuilderTemplates" type="user_role">
69+
<entity name="rolePageBuilderTemplates" type="user_role" extends="adminRestrictedProductRole">
7070
<data key="name" unique="suffix">Role_Page_Builder_Templates_</data>
7171
<data key="rolename" unique="suffix">Role_Page_Builder_Templates_</data>
7272
<data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
@@ -76,15 +76,15 @@
7676
<item>1</item>
7777
</array>
7878
<array key="resource">
79-
<item>Magento_Backend::dashboard</item>
80-
<item>Magento_Backend::content</item>
81-
<item>Magento_Backend::content_elements</item>
82-
<item>Magento_Cms::page</item>
83-
<item>Magento_Cms::save</item>
84-
<item>Magento_PageBuilder::templates</item>
79+
<item name="Magento_Backend::dashboard">Magento_Backend::dashboard</item>
80+
<item name="Magento_Backend::content">Magento_Backend::content</item>
81+
<item name="Magento_Backend::content_elements">Magento_Backend::content_elements</item>
82+
<item name="Magento_Cms::page">Magento_Cms::page</item>
83+
<item name="Magento_Cms::save">Magento_Cms::save</item>
84+
<item name="Magento_PageBuilder::templates">Magento_PageBuilder::templates</item>
8585
</array>
8686
</entity>
87-
<entity name="rolePageBuilderSaveTemplates" type="user_role">
87+
<entity name="rolePageBuilderSaveTemplates" type="user_role" extends="adminRestrictedProductRole">
8888
<data key="name" unique="suffix">Role_Page_Builder_Save_Templates_</data>
8989
<data key="rolename" unique="suffix">Role_Page_Builder_Save_Templates_</data>
9090
<data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
@@ -94,16 +94,16 @@
9494
<item>1</item>
9595
</array>
9696
<array key="resource">
97-
<item>Magento_Backend::dashboard</item>
98-
<item>Magento_Backend::content</item>
99-
<item>Magento_Backend::content_elements</item>
100-
<item>Magento_Cms::page</item>
101-
<item>Magento_Cms::save</item>
102-
<item>Magento_PageBuilder::templates</item>
103-
<item>Magento_PageBuilder::template_save</item>
97+
<item name="Magento_Backend::dashboard">Magento_Backend::dashboard</item>
98+
<item name="Magento_Backend::content">Magento_Backend::content</item>
99+
<item name="Magento_Backend::content_elements">Magento_Backend::content_elements</item>
100+
<item name="Magento_Cms::page">Magento_Cms::page</item>
101+
<item name="Magento_Cms::save">Magento_Cms::save</item>
102+
<item name="Magento_PageBuilder::templates">Magento_PageBuilder::templates</item>
103+
<item name="Magento_PageBuilder::template_save">Magento_PageBuilder::template_save</item>
104104
</array>
105105
</entity>
106-
<entity name="rolePageBuilderApplyTemplates" type="user_role">
106+
<entity name="rolePageBuilderApplyTemplates" type="user_role" extends="adminRestrictedProductRole">
107107
<data key="name" unique="suffix">Role_Page_Builder_Apply_Templates_</data>
108108
<data key="rolename" unique="suffix">Role_Page_Builder_Apply_Templates_</data>
109109
<data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
@@ -113,16 +113,16 @@
113113
<item>1</item>
114114
</array>
115115
<array key="resource">
116-
<item>Magento_Backend::dashboard</item>
117-
<item>Magento_Backend::content</item>
118-
<item>Magento_Backend::content_elements</item>
119-
<item>Magento_Cms::page</item>
120-
<item>Magento_Cms::save</item>
121-
<item>Magento_PageBuilder::templates</item>
122-
<item>Magento_PageBuilder::template_apply</item>
116+
<item name="Magento_Backend::dashboard">Magento_Backend::dashboard</item>
117+
<item name="Magento_Backend::content">Magento_Backend::content</item>
118+
<item name="Magento_Backend::content_elements">Magento_Backend::content_elements</item>
119+
<item name="Magento_Cms::page">Magento_Cms::page</item>
120+
<item name="Magento_Cms::save">Magento_Cms::save</item>
121+
<item name="Magento_PageBuilder::templates">Magento_PageBuilder::templates</item>
122+
<item name="Magento_PageBuilder::template_apply">Magento_PageBuilder::template_apply</item>
123123
</array>
124124
</entity>
125-
<entity name="rolePageBuilderDeleteTemplates" type="user_role">
125+
<entity name="rolePageBuilderDeleteTemplates" type="user_role" extends="adminRestrictedProductRole">
126126
<data key="name" unique="suffix">Role_Page_Builder_Delete_Templates_</data>
127127
<data key="rolename" unique="suffix">Role_Page_Builder_Delete_Templates_</data>
128128
<data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
@@ -132,13 +132,13 @@
132132
<item>1</item>
133133
</array>
134134
<array key="resource">
135-
<item>Magento_Backend::dashboard</item>
136-
<item>Magento_Backend::content</item>
137-
<item>Magento_Backend::content_elements</item>
138-
<item>Magento_Cms::page</item>
139-
<item>Magento_Cms::save</item>
140-
<item>Magento_PageBuilder::templates</item>
141-
<item>Magento_PageBuilder::template_delete</item>
135+
<item name="Magento_Backend::dashboard">Magento_Backend::dashboard</item>
136+
<item name="Magento_Backend::content">Magento_Backend::content</item>
137+
<item name="Magento_Backend::content_elements">Magento_Backend::content_elements</item>
138+
<item name="Magento_Cms::page">Magento_Cms::page</item>
139+
<item name="Magento_Cms::save">Magento_Cms::save</item>
140+
<item name="Magento_PageBuilder::templates">Magento_PageBuilder::templates</item>
141+
<item name="Magento_PageBuilder::template_delete">Magento_PageBuilder::template_delete</item>
142142
</array>
143143
</entity>
144144
</entities>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplatesPermission.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="pagebuilder-templates-permissions"/>
22+
<skip>
23+
<issueId value="MQE-2160"/>
24+
</skip>
2225
</annotations>
2326
<before>
2427
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplatesPermission.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="pagebuilder-templates-permissions"/>
22+
<skip>
23+
<issueId value="MQE-2160"/>
24+
</skip>
2225
</annotations>
2326
<before>
2427
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderSaveTemplatesPermission.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="pagebuilder-templates-permissions"/>
22+
<skip>
23+
<issueId value="MQE-2160"/>
24+
</skip>
2225
</annotations>
2326
<before>
2427
<createData entity="_emptyCmsPage" stepKey="createCMSPage"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesPermission.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="pagebuilder-templates-permissions"/>
22+
<skip>
23+
<issueId value="MQE-2160"/>
24+
</skip>
2225
</annotations>
2326
<before>
2427
<createData entity="rolePageBuilderTemplates" stepKey="role1"/>

‎app/code/Magento/PageBuilder/view/frontend/web/css/source/_icons.less

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
// * See COPYING.txt for license details.
44
// */
55

6-
@font-face {
7-
font-family: @icons-pagebuilder__font-name;
8-
font-style: normal;
9-
font-weight: normal;
10-
src: url('@{icons-pagebuilder__font-path}.eot');
11-
src: url('@{icons-pagebuilder__font-path}.eot?#iefix') format('embedded-opentype'),
12-
url('@{icons-pagebuilder__font-path}.woff') format('woff'),
13-
url('@{icons-pagebuilder__font-path}.ttf') format('truetype');
14-
}
15-
166
//
177
// Common
188
// _____________________________________________
199

2010
& when (@media-common = true) {
11+
@font-face {
12+
font-family: @icons-pagebuilder__font-name;
13+
font-style: normal;
14+
font-weight: normal;
15+
src: url('@{icons-pagebuilder__font-path}.eot');
16+
src: url('@{icons-pagebuilder__font-path}.eot?#iefix') format('embedded-opentype'),
17+
url('@{icons-pagebuilder__font-path}.woff') format('woff'),
18+
url('@{icons-pagebuilder__font-path}.ttf') format('truetype');
19+
}
20+
2121
.pagebuilder-icon {
2222
-webkit-font-smoothing: antialiased;
2323
font-family: @icons-pagebuilder__font-name;

‎dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/ProductAttributeRepositoryTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ private function createPageBuilderAttribute($attributeCode)
4545
"frontend_input" => "textarea",
4646
"is_wysiwyg_enabled" => 1,
4747
"is_visible_on_front" => true,
48-
"is_searchable" => true,
49-
"is_visible_in_advanced_search" => true,
50-
"is_filterable" => true,
51-
"is_filterable_in_search" => true,
48+
"is_searchable" => false,
49+
"is_visible_in_advanced_search" => false,
50+
"is_filterable" => false,
51+
"is_filterable_in_search" => false,
5252
\Magento\Framework\Api\ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY => [
5353
'is_pagebuilder_enabled' => 1
5454
]

0 commit comments

Comments
 (0)