Skip to content

Commit 941a525

Browse files
VladimirZaetsVladimirZaets
authored
Merge pull request #1019 from magento-frontend/MAGETWO-52958-1
Story - MAGETWO-52958 Better Semantic for UI Components - MAGETWO-59587Debugging and profiling tools for UI Components and Javascript modules
2 parents f8b51d3 + fb244c0 commit 941a525

File tree

509 files changed

+46489
-9613
lines changed

Some content is hidden

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

509 files changed

+46489
-9613
lines changed

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

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,35 @@
99
<argument name="data" xsi:type="array">
1010
<item name="js_config" xsi:type="array">
1111
<item name="provider" xsi:type="string">notification_area.notification_area_data_source</item>
12-
<item name="deps" xsi:type="string">notification_area.notification_area_data_source</item>
1312
</item>
14-
<item name="spinner" xsi:type="string">columns</item>
1513
</argument>
16-
<dataSource name="notification_area_data_source">
17-
<argument name="dataProvider" xsi:type="configurableObject">
18-
<argument name="class" xsi:type="string">Magento\AdminNotification\Ui\Component\DataProvider\DataProvider</argument>
19-
<argument name="name" xsi:type="string">notification_area_data_source</argument>
20-
<argument name="primaryFieldName" xsi:type="string">identity</argument>
21-
<argument name="requestFieldName" xsi:type="string">identity</argument>
22-
<argument name="data" xsi:type="array">
23-
<item name="config" xsi:type="array">
24-
<item name="component" xsi:type="string">Magento_Ui/js/grid/provider</item>
25-
<item name="update_url" xsi:type="url" path="mui/index/render"/>
26-
<item name="storageConfig" xsi:type="array">
27-
<item name="indexField" xsi:type="string">identity</item>
28-
</item>
29-
</item>
30-
</argument>
31-
</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>
3233
</dataSource>
33-
<columns name="columns">
34-
<argument name="data" xsi:type="array">
35-
<item name="config" xsi:type="array">
36-
<item name="component" xsi:type="string">Magento_AdminNotification/js/grid/listing</item>
37-
<item name="template" xsi:type="string">Magento_AdminNotification/grid/listing</item>
38-
</item>
39-
</argument>
40-
<column name="created_at">
41-
<argument name="data" xsi:type="array">
42-
<item name="config" xsi:type="array">
43-
<item name="component" xsi:type="string">Magento_AdminNotification/js/grid/columns/message</item>
44-
<item name="label" xsi:type="string" translate="true"/>
45-
<item name="dataType" xsi:type="string">text</item>
46-
<item name="sorting" xsi:type="string">asc</item>
47-
<item name="sortOrder" xsi:type="number">30</item>
48-
</item>
49-
</argument>
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>
5041
</column>
5142
</columns>
5243
</listing>

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

Lines changed: 122 additions & 118 deletions
Large diffs are not rendered by default.

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

Lines changed: 105 additions & 116 deletions
Large diffs are not rendered by default.

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@
77
-->
88
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
99
<columns name="design_config_columns">
10-
<column name="theme_theme_id">
11-
<argument name="data" xsi:type="array">
12-
<item name="options" xsi:type="object">Magento\Framework\View\Design\Theme\Label</item>
13-
<item name="config" xsi:type="array">
14-
<item name="filter" xsi:type="string">select</item>
15-
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>
16-
<item name="dataType" xsi:type="string">select</item>
17-
<item name="label" xsi:type="string" translate="true">Theme Name</item>
18-
<item name="sortOrder" xsi:type="number">40</item>
19-
</item>
20-
</argument>
10+
<column name="theme_theme_id" component="Magento_Ui/js/grid/columns/select" sortOrder="40">
11+
<settings>
12+
<options class="Magento\Framework\View\Design\Theme\Label"/>
13+
<filter>select</filter>
14+
<dataType>select</dataType>
15+
<label translate="true">Theme Name</label>
16+
</settings>
2117
</column>
2218
</columns>
2319
</listing>

‎app/code/Magento/Braintree/Test/Unit/Ui/Component/Report/Filters/Type/DateRangeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected function setUp()
5353
$processor = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\Processor::class)
5454
->disableOriginalConstructor()
5555
->getMock();
56-
$this->contextMock->expects(static::any())
56+
$this->contextMock->expects(static::atLeastOnce())
5757
->method('getProcessor')
5858
->willReturn($processor);
5959
$this->uiComponentFactory = $this->getMockBuilder(UiComponentFactory::class)

0 commit comments

Comments
 (0)