Skip to content

Commit 5affd8a

Browse files
author
Sergii Kovalenko
committed
MAGETWO-52958: Better Semantic for UI Components
-- squash commit
1 parent 896e10f commit 5affd8a

File tree

498 files changed

+50061
-1401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

498 files changed

+50061
-1401
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/ui_component/notification_area_new.xml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
9+
<argument name="data" xsi:type="array">
10+
<item name="js_config" xsi:type="array">
11+
<item name="provider" xsi:type="string">notification_area.notification_area_data_source</item>
12+
</item>
13+
</argument>
14+
<settings>
15+
<spinner>columns</spinner>
16+
<deps>
17+
<dep>notification_area.notification_area_data_source</dep>
18+
</deps>
19+
</settings>
20+
<dataSource name="notification_area_data_source" component="Magento_Ui/js/grid/provider">
21+
<settings>
22+
<storageConfig>
23+
<param name="indexField" xsi:type="string">identity</param>
24+
</storageConfig>
25+
<updateUrl path="mui/index/render"/>
26+
</settings>
27+
<dataProvider class="Magento\AdminNotification\Ui\Component\DataProvider\DataProvider" name="notification_area_data_source">
28+
<settings>
29+
<requestFieldName>identity</requestFieldName>
30+
<primaryFieldName>identity</primaryFieldName>
31+
</settings>
32+
</dataProvider>
33+
</dataSource>
34+
<columns name="columns" component="Magento_AdminNotification/js/grid/listing" template="Magento_AdminNotification/grid/listing">
35+
<column name="created_at" component="Magento_AdminNotification/js/grid/columns/message" sortOrder="30">
36+
<settings>
37+
<dataType>text</dataType>
38+
<label translate="true"/>
39+
<sorting>asc</sorting>
40+
</settings>
41+
</column>
42+
</columns>
43+
</listing>

‎app/code/Magento/Analytics/view/adminhtml/ui_component/analytics_subscription_form.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<item name="dataScope" xsi:type="string">data</item>
1818
<item name="namespace" xsi:type="string">analytics_subscription_form</item>
1919
<item name="ajaxSaveType" xsi:type="string">simple</item>
20-
<item name="ajaxSave" xsi:type="string">true</item>
20+
<item name="ajaxSave" xsi:type="boolean">true</item>
2121
</item>
2222
<item name="template" xsi:type="string">templates/form/collapsible</item>
2323
</argument>
@@ -97,7 +97,7 @@
9797
<argument name="data" xsi:type="array">
9898
<item name="config" xsi:type="array">
9999
<item name="displayArea" xsi:type="string">actions-secondary</item>
100-
<item name="displayAsLink" xsi:type="string">true</item>
100+
<item name="displayAsLink" xsi:type="boolean">true</item>
101101
<item name="buttonClasses" xsi:type="string">advanced-reports-subscription-postpone</item>
102102
<item name="title" xsi:type="string" translate="true">Remind me later</item>
103103
<item name="actions" xsi:type="array">
@@ -113,7 +113,7 @@
113113
<argument name="data" xsi:type="array">
114114
<item name="config" xsi:type="array">
115115
<item name="displayArea" xsi:type="string">actions-secondary</item>
116-
<item name="displayAsLink" xsi:type="string">true</item>
116+
<item name="displayAsLink" xsi:type="boolean">true</item>
117117
<item name="buttonClasses" xsi:type="string">advanced-reports-subscription-disable</item>
118118
<item name="title" xsi:type="string" translate="true">Disable Advanced Reporting</item>
119119
<item name="actions" xsi:type="array">

‎app/code/Magento/Analytics/view/adminhtml/ui_component/analytics_subscription_form_new.xml‎

Lines changed: 247 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,247 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
9+
<argument name="data" xsi:type="array">
10+
<item name="js_config" xsi:type="array">
11+
<item name="provider" xsi:type="string">analytics_subscription_form.analytics_subscription_form_data_source</item>
12+
</item>
13+
<item name="label" xsi:type="string" translate="true">Analytics Subscription</item>
14+
<item name="template" xsi:type="string">templates/form/collapsible</item>
15+
</argument>
16+
<settings>
17+
<namespace>analytics_subscription_form</namespace>
18+
<ajaxSave>true</ajaxSave>
19+
<ajaxSaveType>simple</ajaxSaveType>
20+
<dataScope>data</dataScope>
21+
<deps>
22+
<dep>analytics_subscription_form.analytics_subscription_form_data_source</dep>
23+
</deps>
24+
</settings>
25+
<dataSource name="analytics_subscription_form_data_source">
26+
<argument name="dataProvider" xsi:type="configurableObject">
27+
<argument name="data" xsi:type="array">
28+
<item name="config" xsi:type="array">
29+
<item name="postpone_url" xsi:type="url" path="analytics/subscription/postpone"/>
30+
</item>
31+
</argument>
32+
</argument>
33+
<argument name="data" xsi:type="array">
34+
<item name="js_config" xsi:type="array">
35+
<item name="component" xsi:type="string">Magento_Ui/js/form/provider</item>
36+
</item>
37+
</argument>
38+
<settings>
39+
<submitUrl path="analytics/subscription/activate"/>
40+
</settings>
41+
<dataProvider class="Magento\Analytics\Ui\DataProvider\DummyDataProvider" name="analytics_subscription_form_data_source">
42+
<settings>
43+
<clientConfig>
44+
<param name="validateBeforeSave" xsi:type="boolean">false</param>
45+
</clientConfig>
46+
</settings>
47+
</dataProvider>
48+
</dataSource>
49+
<modal name="analytics_subscription_modal" component="Magento_Analytics/js/modal/modal-component">
50+
<settings>
51+
<onCancel>actionCancel</onCancel>
52+
<state>true</state>
53+
<options>
54+
<option name="modalClass" xsi:type="string">advanced-reports-subscription-modal</option>
55+
<option name="title" xsi:type="string" translate="true">Advanced Reporting</option>
56+
<option name="subTitle" xsi:type="string" translate="true">powered by Magento Business Intelligence</option>
57+
<option name="type" xsi:type="string">popup</option>
58+
<option name="responsive" xsi:type="boolean">true</option>
59+
<option name="innerScroll" xsi:type="boolean">true</option>
60+
<option name="autoOpen" xsi:type="boolean">true</option>
61+
</options>
62+
</settings>
63+
<fieldset name="analytics_subscription_fieldset">
64+
<settings>
65+
<label/>
66+
</settings>
67+
<container name="analytics_subscription_text" template="ui/form/components/complex">
68+
<argument name="data" xsi:type="array">
69+
<item name="config" xsi:type="array">
70+
<item name="label" xsi:type="string"/>
71+
<item name="additionalClasses" xsi:type="string">advanced-reports-subscription-text</item>
72+
<item name="text" xsi:type="string" translate="true"><![CDATA[<p>When you turn on Advanced
73+
Reporting, you'll have access to a suite of dynamic reports tailored to your business. Example
74+
of the new data and trend reports, listed by category, include:</p><ul class="list">
75+
<li><strong>Order:</strong> Number of orders, total revenue, and AOV</li><li><strong>Customer:
76+
</strong> New registered accounts, unique customers, number of orders, AOV, revenue by email
77+
</li><li><strong>Product:</strong> Quantity sold, bestsellers by volume/revenue</li></ul><p>A
78+
personalized dashboard includes all reports - separate from your Admin Panel, yet still at your
79+
fingertips.</p><p>We're excited to offer these valuable tools that can help your business become
80+
more data-driven. For more information, <a href="#" target="_blank">view details</a> or see our
81+
<a href="#" target="_blank">terms and conditions</a>.</p>]]>
82+
</item>
83+
</item>
84+
</argument>
85+
</container>
86+
<container name="analytics_subscription_buttons" template="Magento_Analytics/buttons-container">
87+
<argument name="data" xsi:type="array">
88+
<item name="config" xsi:type="array">
89+
<item name="label" xsi:type="string"/>
90+
</item>
91+
</argument>
92+
<button name="analytics_subscription_button_postpone" displayArea="actions-secondary">
93+
<argument name="data" xsi:type="array">
94+
<item name="config" xsi:type="array">
95+
<item name="buttonClasses" xsi:type="string">advanced-reports-subscription-postpone</item>
96+
<item name="actions" xsi:type="array">
97+
<item name="0" xsi:type="array">
98+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_modal</item>
99+
<item name="actionName" xsi:type="string">actionCancel</item>
100+
</item>
101+
</item>
102+
</item>
103+
</argument>
104+
<settings>
105+
<displayAsLink>true</displayAsLink>
106+
<title>Remind me later</title>
107+
</settings>
108+
</button>
109+
<button name="analytics_subscription_button_decline" displayArea="actions-secondary">
110+
<argument name="data" xsi:type="array">
111+
<item name="config" xsi:type="array">
112+
<item name="buttonClasses" xsi:type="string">advanced-reports-subscription-disable</item>
113+
<item name="actions" xsi:type="array">
114+
<item name="0" xsi:type="array">
115+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_modal</item>
116+
<item name="actionName" xsi:type="string">closeModal</item>
117+
</item>
118+
<item name="1" xsi:type="array">
119+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_decline_modal</item>
120+
<item name="actionName" xsi:type="string">openModal</item>
121+
</item>
122+
</item>
123+
</item>
124+
</argument>
125+
<settings>
126+
<displayAsLink>true</displayAsLink>
127+
<title>Disable Advanced Reporting</title>
128+
</settings>
129+
</button>
130+
<button name="analytics_subscription_button_accept" displayArea="actions-primary">
131+
<argument name="data" xsi:type="array">
132+
<item name="config" xsi:type="array">
133+
<item name="controlCheckbox" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_checkbox:checked</item>
134+
<item name="actions" xsi:type="array">
135+
<item name="0" xsi:type="array">
136+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_form</item>
137+
<item name="actionName" xsi:type="string">save</item>
138+
</item>
139+
<item name="1" xsi:type="array">
140+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_modal</item>
141+
<item name="actionName" xsi:type="string">closeModal</item>
142+
</item>
143+
</item>
144+
</item>
145+
</argument>
146+
<settings>
147+
<title>Enable Advanced Reporting</title>
148+
<imports>
149+
<link name="disabled">!${ $.controlCheckbox }</link>
150+
</imports>
151+
</settings>
152+
</button>
153+
<field name="analytics_subscription_checkbox"
154+
displayArea="actions-primary"
155+
template="Magento_Analytics/form/components/single/checkbox"
156+
formElement="checkbox">
157+
<argument name="data" xsi:type="array">
158+
<item name="config" xsi:type="array">
159+
<item name="value" xsi:type="string">1</item>
160+
</item>
161+
</argument>
162+
<settings>
163+
<additionalClasses>
164+
<class name="admin__field-wide">true</class>
165+
</additionalClasses>
166+
<dataScope>analytics_subscription_checkbox</dataScope>
167+
</settings>
168+
<formElements>
169+
<checkbox>
170+
<settings>
171+
<description><![CDATA[I agree to securely
172+
transmit data to Magento Business Intelligence.</br >
173+
<a href="#" target="_blank">Learn more</a>.]]></description>
174+
<valueMap>
175+
<map name="true" xsi:type="string">1</map>
176+
<map name="false" xsi:type="string">0</map>
177+
</valueMap>
178+
</settings>
179+
</checkbox>
180+
</formElements>
181+
</field>
182+
</container>
183+
</fieldset>
184+
</modal>
185+
<modal name="analytics_subscription_decline_modal">
186+
<settings>
187+
<onCancel>actionCancel</onCancel>
188+
<options>
189+
<option name="modalClass" xsi:type="string">advanced-reports-decline-subscription-modal</option>
190+
<option name="title" xsi:type="string" translate="true">Are you sure you want to opt out?</option>
191+
<option name="type" xsi:type="string">popup</option>
192+
<option name="responsive" xsi:type="boolean">true</option>
193+
<option name="autoOpen" xsi:type="boolean">false</option>
194+
<option name="innerScroll" xsi:type="boolean">true</option>
195+
<option name="buttons" xsi:type="array">
196+
<item name="0" xsi:type="array">
197+
<item name="text" xsi:type="string" translate="true">Cancel</item>
198+
<item name="class" xsi:type="string">action-secondary</item>
199+
<item name="actions" xsi:type="array">
200+
<item name="0" xsi:type="array">
201+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_decline_modal</item>
202+
<item name="actionName" xsi:type="string">closeModal</item>
203+
</item>
204+
<item name="1" xsi:type="array">
205+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_modal</item>
206+
<item name="actionName" xsi:type="string">openModal</item>
207+
</item>
208+
</item>
209+
</item>
210+
<item name="1" xsi:type="array">
211+
<item name="text" xsi:type="string" translate="true">Opt out</item>
212+
<item name="class" xsi:type="string">action-primary</item>
213+
<item name="actions" xsi:type="array">
214+
<item name="0" xsi:type="array">
215+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_checkbox</item>
216+
<item name="actionName" xsi:type="string">checked</item>
217+
<item name="params" xsi:type="array">
218+
<item name="0" xsi:type="boolean">false</item>
219+
</item>
220+
</item>
221+
<item name="1" xsi:type="array">
222+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_form</item>
223+
<item name="actionName" xsi:type="string">save</item>
224+
</item>
225+
<item name="2" xsi:type="array">
226+
<item name="targetName" xsi:type="string">ns = ${ $.ns }, index = analytics_subscription_decline_modal</item>
227+
<item name="actionName" xsi:type="string">closeModal</item>
228+
</item>
229+
</item>
230+
</item>
231+
</option>
232+
</options>
233+
</settings>
234+
<container name="analytics_subscription_decline_text" template="ui/form/components/complex">
235+
<argument name="data" xsi:type="array">
236+
<item name="config" xsi:type="array">
237+
<item name="label" xsi:type="string"/>
238+
<item name="additionalClasses" xsi:type="string">advanced-reports-subscription-text</item>
239+
<item name="text" xsi:type="string" translate="true"><![CDATA[<p>Advanced Reporting in included,
240+
free of charge, in your Magento software. When you opt out, we collect no product, order, and
241+
customer data to generate our dynamic reports.</p><p>To opt in later: You can always turn on Advanced
242+
Reporting in you Admin Panel.</p>]]></item>
243+
</item>
244+
</argument>
245+
</container>
246+
</modal>
247+
</form>

‎app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
</item>
9292
</argument>
9393
</field>
94-
<actionDelete>
94+
<actionDelete name="actionDelete">
9595
<argument name="data" xsi:type="array">
9696
<item name="config" xsi:type="array">
9797
<item name="componentType" xsi:type="string">actionDelete</item>

0 commit comments

Comments
 (0)