Skip to content

Commit 3630d32

Browse files
author
Korshenko, Olexii(okorshenko)
committed
Merge pull request magento#547 from magento-vanilla/PR
[Vanilla] Stories + Bugs
2 parents 50d6f9a + 2792090 commit 3630d32

File tree

105 files changed

+7030
-963
lines changed

Some content is hidden

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

105 files changed

+7030
-963
lines changed

‎app/code/Magento/Backend/Block/System/Design/Edit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected function _prepareLayout()
6464
'Magento\Backend\Block\Widget\Button',
6565
[
6666
'label' => __('Delete'),
67-
'onclick' => 'confirmSetLocation(\'' . __(
67+
'onclick' => 'deleteConfirm(\'' . __(
6868
'Are you sure?'
6969
) . '\', \'' . $this->getDeleteUrl() . '\')',
7070
'class' => 'delete'

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@
174174
<item name="config" xsi:type="array">
175175
<item name="dataScope" xsi:type="string">is_active</item>
176176
<item name="label" xsi:type="string" translate="true">Status</item>
177-
<item name="caption" xsi:type="string" translate="true">Select...</item>
177+
<item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
178+
<item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
178179
<item name="options" xsi:type="array">
179180
<item name="disable" xsi:type="array">
180181
<item name="value" xsi:type="string">0</item>
@@ -319,8 +320,9 @@
319320
<argument name="data" xsi:type="array">
320321
<item name="config" xsi:type="array">
321322
<item name="dataScope" xsi:type="string">custom_theme</item>
322-
<item name="caption" xsi:type="string" translate="true">Select...</item>
323323
<item name="label" xsi:type="string" translate="true">Custom Theme</item>
324+
<item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
325+
<item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
324326
</item>
325327
</argument>
326328
</filterSelect>
@@ -331,8 +333,9 @@
331333
<argument name="data" xsi:type="array">
332334
<item name="config" xsi:type="array">
333335
<item name="dataScope" xsi:type="string">custom_root_template</item>
334-
<item name="caption" xsi:type="string" translate="true">Select...</item>
335336
<item name="label" xsi:type="string" translate="true">Custom Layout</item>
337+
<item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
338+
<item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
336339
</item>
337340
</argument>
338341
</filterSelect>
@@ -352,6 +355,19 @@
352355
</item>
353356
</argument>
354357
</filterInput>
358+
<filterSelect name="page_layout">
359+
<argument name="optionsProvider" xsi:type="configurableObject">
360+
<argument name="class" xsi:type="string">Magento\Cms\Model\Page\Source\PageLayout</argument>
361+
</argument>
362+
<argument name="data" xsi:type="array">
363+
<item name="config" xsi:type="array">
364+
<item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
365+
<item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
366+
<item name="dataScope" xsi:type="string">page_layout</item>
367+
<item name="label" xsi:type="string" translate="true">Layout</item>
368+
</item>
369+
</argument>
370+
</filterSelect>
355371
</filters>
356372
<massaction name="listing_massaction">
357373
<argument name="data" xsi:type="array">
@@ -425,6 +441,11 @@
425441
<item name="provider" xsi:type="string">cms_page_listing.cms_page_listing.listing_top.bookmarks</item>
426442
<item name="namespace" xsi:type="string">current</item>
427443
</item>
444+
<item name="editorConfig" xsi:type="array">
445+
<item name="selectProvider" xsi:type="string">cms_page_listing.cms_page_listing.cms_page_columns.ids</item>
446+
<item name="enabled" xsi:type="boolean">false</item>
447+
<item name="indexField" xsi:type="string">page_id</item>
448+
</item>
428449
<item name="childDefaults" xsi:type="array">
429450
<item name="fieldAction" xsi:type="array">
430451
<item name="provider" xsi:type="string">cms_page_listing.cms_page_listing.cms_page_columns.actions</item>
@@ -474,6 +495,12 @@
474495
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/column</item>
475496
</item>
476497
<item name="config" xsi:type="array">
498+
<item name="editor" xsi:type="array">
499+
<item name="editorType" xsi:type="string">text</item>
500+
<item name="validation" xsi:type="array">
501+
<item name="required-entry" xsi:type="boolean">true</item>
502+
</item>
503+
</item>
477504
<item name="dataType" xsi:type="string">text</item>
478505
<item name="align" xsi:type="string">left</item>
479506
<item name="label" xsi:type="string" translate="true">Title</item>
@@ -486,6 +513,7 @@
486513
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/column</item>
487514
</item>
488515
<item name="config" xsi:type="array">
516+
<item name="editor" xsi:type="string">text</item>
489517
<item name="dataType" xsi:type="string">text</item>
490518
<item name="align" xsi:type="string">left</item>
491519
<item name="label" xsi:type="string" translate="true">URL Key</item>
@@ -499,6 +527,7 @@
499527
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>
500528
</item>
501529
<item name="config" xsi:type="array">
530+
<item name="editor" xsi:type="string">select</item>
502531
<item name="dataType" xsi:type="string">select</item>
503532
<item name="align" xsi:type="string">left</item>
504533
<item name="label" xsi:type="string" translate="true">Layout</item>
@@ -526,6 +555,7 @@
526555
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>
527556
</item>
528557
<item name="config" xsi:type="array">
558+
<item name="editor" xsi:type="string">select</item>
529559
<item name="dataType" xsi:type="string">select</item>
530560
<item name="align" xsi:type="string">left</item>
531561
<item name="label" xsi:type="string" translate="true">Status</item>
@@ -538,6 +568,7 @@
538568
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/date</item>
539569
</item>
540570
<item name="config" xsi:type="array">
571+
<item name="editor" xsi:type="string">date</item>
541572
<item name="dataType" xsi:type="string">date</item>
542573
<item name="align" xsi:type="string">left</item>
543574
<item name="label" xsi:type="string" translate="true">Created</item>
@@ -550,6 +581,7 @@
550581
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/date</item>
551582
</item>
552583
<item name="config" xsi:type="array">
584+
<item name="editor" xsi:type="string">date</item>
553585
<item name="dataType" xsi:type="string">date</item>
554586
<item name="align" xsi:type="string">left</item>
555587
<item name="label" xsi:type="string" translate="true">Modified</item>
@@ -562,6 +594,7 @@
562594
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/date</item>
563595
</item>
564596
<item name="config" xsi:type="array">
597+
<item name="editor" xsi:type="string">date</item>
565598
<item name="dataType" xsi:type="string">date</item>
566599
<item name="align" xsi:type="string">left</item>
567600
<item name="label" xsi:type="string" translate="true">Custom design from</item>
@@ -576,6 +609,7 @@
576609
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/date</item>
577610
</item>
578611
<item name="config" xsi:type="array">
612+
<item name="editor" xsi:type="string">date</item>
579613
<item name="dataType" xsi:type="string">date</item>
580614
<item name="align" xsi:type="string">left</item>
581615
<item name="label" xsi:type="string" translate="true">Custom design to</item>
@@ -591,6 +625,7 @@
591625
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>
592626
</item>
593627
<item name="config" xsi:type="array">
628+
<item name="editor" xsi:type="string">select</item>
594629
<item name="dataType" xsi:type="string">select</item>
595630
<item name="align" xsi:type="string">left</item>
596631
<item name="label" xsi:type="string" translate="true">Custom Theme</item>
@@ -605,6 +640,7 @@
605640
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>
606641
</item>
607642
<item name="config" xsi:type="array">
643+
<item name="editor" xsi:type="string">select</item>
608644
<item name="dataType" xsi:type="string">select</item>
609645
<item name="align" xsi:type="string">left</item>
610646
<item name="label" xsi:type="string" translate="true">Custom Layout</item>
@@ -618,6 +654,7 @@
618654
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/column</item>
619655
</item>
620656
<item name="config" xsi:type="array">
657+
<item name="editor" xsi:type="string">text</item>
621658
<item name="dataType" xsi:type="string">text</item>
622659
<item name="align" xsi:type="string">left</item>
623660
<item name="label" xsi:type="string" translate="true">Meta Keywords</item>
@@ -631,6 +668,7 @@
631668
<item name="component" xsi:type="string">Magento_Ui/js/grid/columns/column</item>
632669
</item>
633670
<item name="config" xsi:type="array">
671+
<item name="editor" xsi:type="string">text</item>
634672
<item name="dataType" xsi:type="string">text</item>
635673
<item name="align" xsi:type="string">left</item>
636674
<item name="label" xsi:type="string" translate="true">Meta Description</item>

‎app/code/Magento/Config/Block/System/Config/Form/Fieldset.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,10 @@ protected function _getExtraJs($element)
226226
*/
227227
protected function _isCollapseState($element)
228228
{
229-
if ($element->getExpanded()) {
229+
if (
230+
$element->getExpanded() ||
231+
($element->getForm() && $element->getForm()->getElements()->count() === 1)
232+
) {
230233
return true;
231234
}
232235

‎app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,17 @@ protected function setUp()
117117

118118
$this->_elementMock = $this->getMock(
119119
'Magento\Framework\Data\Form\Element\Text',
120-
['getId', 'getHtmlId', 'getName', 'getElements', 'getLegend', 'getComment', 'getIsNested', 'getExpanded'],
120+
[
121+
'getId',
122+
'getHtmlId',
123+
'getName',
124+
'getElements',
125+
'getLegend',
126+
'getComment',
127+
'getIsNested',
128+
'getExpanded',
129+
'getForm'
130+
],
121131
[],
122132
'',
123133
false,
@@ -152,6 +162,9 @@ public function testRenderWithoutStoredElements($expanded, $nested, $extra)
152162
{
153163
$this->userMock->expects($this->any())->method('getExtra')->willReturn($extra);
154164
$collection = $this->_testHelper->getObject('Magento\Framework\Data\Form\Element\Collection');
165+
$formMock = $this->getMock('Magento\Framework\Data\Form', [], [], '', false);
166+
$this->_elementMock->expects($this->any())->method('getForm')->willReturn($formMock);
167+
$formMock->expects($this->any())->method('getElements')->willReturn($collection);
155168
$this->_elementMock->expects($this->any())->method('getElements')->will($this->returnValue($collection));
156169
$this->_elementMock->expects($this->any())->method('getIsNested')->will($this->returnValue($nested));
157170
$this->_elementMock->expects($this->any())->method('getExpanded')->will($this->returnValue($expanded));
@@ -210,7 +223,9 @@ public function testRenderWithStoredElements($expanded, $nested, $extra)
210223
);
211224
$collection->add($fieldMock);
212225
$collection->add($fieldSetMock);
213-
226+
$formMock = $this->getMock('Magento\Framework\Data\Form', [], [], '', false);
227+
$this->_elementMock->expects($this->any())->method('getForm')->willReturn($formMock);
228+
$formMock->expects($this->any())->method('getElements')->willReturn($collection);
214229
$this->_elementMock->expects($this->any())->method('getElements')->will($this->returnValue($collection));
215230
$this->_elementMock->expects($this->any())->method('getIsNested')->will($this->returnValue($nested));
216231
$this->_elementMock->expects($this->any())->method('getExpanded')->will($this->returnValue($expanded));
@@ -260,7 +275,7 @@ protected function dataProvider()
260275
'extra' => ['configState' => [$this->testData['htmlId'] => true]],
261276
],
262277
'collapsedNotNestedNoExtra' => [
263-
'expanded' => false,
278+
'expanded' => true,
264279
'nested' => false,
265280
'extra' => [],
266281
],

‎app/code/Magento/Theme/view/base/requirejs-config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ var config = {
2121
"mage/requirejs/plugin/id-normalizer": ["jquery"],
2222
"mage/webapi": ["jquery"],
2323
"jquery/ui": ["jquery"],
24+
"MutationObserver": ["es6-collections"],
2425
"tinymce": {
2526
"exports": "tinymce"
2627
},

‎app/code/Magento/Translation/Model/FileManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct(
3737
public function createTranslateConfigAsset()
3838
{
3939
return $this->assetRepo->createArbitrary(
40-
$this->assetRepo->getStaticViewFileContext()->getConfigPath() . '/' . self::TRANSLATION_CONFIG_FILE_NAME,
40+
$this->assetRepo->getStaticViewFileContext()->getPath() . '/' . self::TRANSLATION_CONFIG_FILE_NAME,
4141
''
4242
);
4343
}

‎app/code/Magento/Translation/Test/Unit/Model/FileManagerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ public function testCreateTranslateConfigAsset()
3838
true,
3939
true,
4040
true,
41-
['getConfigPath']
41+
['getPath']
4242
);
4343
$this->assetRepoMock->expects($this->once())->method('getStaticViewFileContext')->willReturn($contextMock);
44-
$contextMock->expects($this->once())->method('getConfigPath')->willReturn($path);
44+
$contextMock->expects($this->once())->method('getPath')->willReturn($path);
4545
$this->assetRepoMock
4646
->expects($this->once())
4747
->method('createArbitrary')

‎app/code/Magento/Ui/Component/Filters/Type/Select.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ protected function applyFilter()
9393
{
9494
if (isset($this->filterData[$this->getName()])) {
9595
$value = $this->filterData[$this->getName()];
96+
$conditionType = is_array($value) ? 'in' : 'eq';
9697

9798
if (!empty($value) || is_numeric($value)) {
98-
$filter = $this->filterBuilder->setConditionType('eq')
99+
$filter = $this->filterBuilder->setConditionType($conditionType)
99100
->setField($this->getName())
100101
->setValue($value)
101102
->create();

‎app/code/Magento/Ui/view/base/requirejs-config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ var config = {
1111
'*': {
1212
uiComponent: 'Magento_Ui/js/lib/component/main',
1313
uiRegistry: 'Magento_Ui/js/lib/registry/registry',
14-
uiLayout: 'Magento_Ui/js/core/renderer/layout'
14+
uiLayout: 'Magento_Ui/js/core/renderer/layout',
15+
uiClass: 'Magento_Ui/js/lib/class'
1516
}
1617
}
1718
};

‎app/code/Magento/Ui/view/base/ui_component/templates/listing/default.xhtml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1212
xsi:noNamespaceSchemaLocation="../../../../../../Ui/etc/ui_template.xsd">
1313
<div data-role="spinner" data-component="{{getName()}}.{{getName()}}.{{spinner}}" class="admin__data-grid-loading-mask">
14-
<div class="grid-loader"></div>
14+
<div class="spinner">
15+
<span/><span/><span/><span/><span/><span/><span/><span/>
16+
</div>
1517
</div>
1618
<!-- ko template: getTemplate() --><!-- /ko -->
1719
</div>

‎app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ define([
140140
return false;
141141
}
142142

143-
if (node.disabled) {
143+
if (node.disabled === true) {
144144
return false;
145145
}
146146

‎app/code/Magento/Ui/view/base/web/js/form/components/collection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ define([
9393
hasChanged: function () {
9494
var initial = this.initialItems,
9595
current = this.elems.pluck('index'),
96-
changed = !utils.identical(initial, current);
96+
changed = !utils.equalArrays(initial, current);
9797

9898
return changed || this.elems.some(function (elem) {
9999
return _.some(elem.delegate('hasChanged'));

0 commit comments

Comments
 (0)