Skip to content

Commit 27a0667

Browse files
rganinrganin
committed
Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-61503
2 parents 1e7912f + 2991a00 commit 27a0667

File tree

1,702 files changed

+58688
-14027
lines changed

Some content is hidden

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

1,702 files changed

+58688
-14027
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,12 @@
55
/.settings
66
atlassian*
77
/nbproject
8+
/robots.txt
9+
/pub/robots.txt
810
/sitemap
911
/sitemap.xml
12+
/pub/sitemap
13+
/pub/sitemap.xml
1014
/.idea
1115
/.gitattributes
1216
/app/config_sandbox

‎.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ addons:
99
- postfix
1010
language: php
1111
php:
12-
- 5.6.29
1312
- 7.0
1413
env:
1514
global:
@@ -30,12 +29,6 @@ cache:
3029
- $HOME/.nvm
3130
- $HOME/node_modules
3231
- $HOME/yarn.lock
33-
matrix:
34-
exclude:
35-
- php: 5.6.29
36-
env: TEST_SUITE=static
37-
- php: 5.6.29
38-
env: TEST_SUITE=js
3932
before_install: ./dev/travis/before_install.sh
4033
install: composer install --no-interaction --prefer-dist
4134
before_script: ./dev/travis/before_script.sh

‎app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<block class="Magento\AdminNotification\Block\Window"
1717
name="notification_window"
1818
as="notification_window"
19-
acl="Magento_AdminNotification::show_toolbar"
19+
aclResource="Magento_AdminNotification::show_toolbar"
2020
template="Magento_AdminNotification::notification/window.phtml"/>
2121
</referenceContainer>
2222
<referenceContainer name="header">

‎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/Model/Condition/CanViewNotification.php

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
namespace Magento\Analytics\Model\Condition;
87

9-
use Magento\Backend\Model\View\Layout\ConditionInterface;
8+
use Magento\Framework\View\Layout\Condition\VisibilityConditionInterface;
109
use Magento\Analytics\Model\NotificationTime;
1110
use Magento\Framework\Intl\DateTimeFactory;
1211

@@ -16,8 +15,13 @@
1615
* Dynamic validator for UI signUp notification form, manage Ui component visibility.
1716
* Return true if last notification was shipped seven days ago.
1817
*/
19-
class CanViewNotification implements ConditionInterface
18+
class CanViewNotification implements VisibilityConditionInterface
2019
{
20+
/**
21+
* Unique condition name.
22+
*/
23+
const NAME = 'can_view_notification';
24+
2125
/**
2226
* Time interval in seconds
2327
*
@@ -52,9 +56,9 @@ public function __construct(
5256
/**
5357
* Validate is notification popup can be shown
5458
*
55-
* @return bool
59+
* @inheritdoc
5660
*/
57-
public function validate()
61+
public function isVisible(array $arguments)
5862
{
5963
$lastNotificationTime = $this->notificationTime->getLastTimeNotification();
6064
if (!$lastNotificationTime) {
@@ -65,4 +69,12 @@ public function validate()
6569
$datetime->getTimestamp() >= $lastNotificationTime + $this->notificationInterval
6670
);
6771
}
72+
73+
/**
74+
* @return string
75+
*/
76+
public function getName()
77+
{
78+
return self::NAME;
79+
}
6880
}

‎app/code/Magento/Analytics/Test/Unit/Model/Condition/CanViewNotificationTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function testValidate()
6666
$this->dateTimeMock->expects($this->once())
6767
->method('getTimestamp')
6868
->willReturn(10005000);
69-
$this->assertTrue($this->canViewNotification->validate());
69+
$this->assertTrue($this->canViewNotification->isVisible([]));
7070
}
7171

7272
public function testValidateFlagRemoved()
@@ -76,6 +76,6 @@ public function testValidateFlagRemoved()
7676
->willReturn(null);
7777
$this->dateTimeFactoryMock->expects($this->never())
7878
->method('create');
79-
$this->assertFalse($this->canViewNotification->validate());
79+
$this->assertFalse($this->canViewNotification->isVisible([]));
8080
}
8181
}

‎app/code/Magento/Analytics/etc/di.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@
2323
</argument>
2424
</arguments>
2525
</type>
26-
<type name="Magento\Backend\Model\View\Layout\ConditionPool">
27-
<arguments>
28-
<argument name="conditions" xsi:type="array">
29-
<item name="analytics::can-view-notification" xsi:type="string">Magento\Analytics\Model\Condition\CanViewNotification</item>
30-
</argument>
31-
</arguments>
32-
</type>
3326
<type name="Magento\Analytics\Controller\Adminhtml\Subscription\Activate">
3427
<arguments>
3528
<argument name="configValueResource" xsi:type="object">Magento\Config\Model\ResourceModel\Config\Data</argument>

‎app/code/Magento/Analytics/view/adminhtml/layout/adminhtml_dashboard_index.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
1010
<body>
1111
<referenceContainer name="content">
12-
<uiComponent name="analytics_subscription_form" acl="Magento_Analytics::analytics_settings"
13-
condition="analytics::can-view-notification"/>
12+
<uiComponent name="analytics_subscription_form" aclResource="Magento_Analytics::analytics_settings">
13+
<visibilityCondition name="can_view_notification" className="Magento\Analytics\Model\Condition\CanViewNotification"/>
14+
</uiComponent>
1415
<block template="Magento_Analytics::dashboard/section.phtml"
1516
class="Magento\Backend\Block\Template"
1617
name="analytics_service_external_link"

0 commit comments

Comments
 (0)