forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.4-develop' into issue-308-create-admin-user-role
- Loading branch information
Showing
7,968 changed files
with
269,782 additions
and
62,049 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| root = true | ||
|
|
||
| [*] | ||
| charset = utf-8 | ||
| end_of_line = lf | ||
| indent_size = 4 | ||
| indent_style = space | ||
| insert_final_newline = true | ||
| trim_trailing_whitespace = true | ||
|
|
||
| [*.md] | ||
| trim_trailing_whitespace = false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
104 changes: 104 additions & 0 deletions
104
app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/DisableAdminUsage.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\AdminAnalytics\Controller\Adminhtml\Config; | ||
|
|
||
| use Magento\Backend\App\Action; | ||
| use Magento\Framework\App\Action\HttpPostActionInterface; | ||
| use Magento\Framework\Controller\ResultFactory; | ||
| use Magento\AdminAnalytics\Model\ResourceModel\Viewer\Logger as NotificationLogger; | ||
| use Magento\Framework\App\ProductMetadataInterface; | ||
| use Magento\Framework\Controller\ResultInterface; | ||
| use Magento\Config\Model\Config\Factory; | ||
|
|
||
| /** | ||
| * Controller to record Admin analytics usage log | ||
| */ | ||
| class DisableAdminUsage extends Action implements HttpPostActionInterface | ||
| { | ||
| /** | ||
| * @var Factory | ||
| */ | ||
| private $configFactory; | ||
|
|
||
| /** | ||
| * @var ProductMetadataInterface | ||
| */ | ||
| private $productMetadata; | ||
|
|
||
| /** | ||
| * @var NotificationLogger | ||
| */ | ||
| private $notificationLogger; | ||
|
|
||
| /** | ||
| * DisableAdminUsage constructor. | ||
| * | ||
| * @param Action\Context $context | ||
| * @param ProductMetadataInterface $productMetadata | ||
| * @param NotificationLogger $notificationLogger | ||
| * @param Factory $configFactory | ||
| */ | ||
| public function __construct( | ||
| Action\Context $context, | ||
| ProductMetadataInterface $productMetadata, | ||
| NotificationLogger $notificationLogger, | ||
| Factory $configFactory | ||
| ) { | ||
| parent::__construct($context); | ||
| $this->configFactory = $configFactory; | ||
| $this->productMetadata = $productMetadata; | ||
| $this->notificationLogger = $notificationLogger; | ||
| } | ||
|
|
||
| /** | ||
| * Change the value of config/admin/usage/enabled | ||
| */ | ||
| private function disableAdminUsage() | ||
| { | ||
| $configModel = $this->configFactory->create(); | ||
| $configModel->setDataByPath('admin/usage/enabled', 0); | ||
| $configModel->save(); | ||
| } | ||
|
|
||
| /** | ||
| * Log information about the last admin usage selection | ||
| * | ||
| * @return ResultInterface | ||
| */ | ||
| private function markUserNotified(): ResultInterface | ||
| { | ||
| $responseContent = [ | ||
| 'success' => $this->notificationLogger->log( | ||
| $this->productMetadata->getVersion() | ||
| ), | ||
| 'error_message' => '' | ||
| ]; | ||
|
|
||
| $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON); | ||
| return $resultJson->setData($responseContent); | ||
| } | ||
|
|
||
| /** | ||
| * Log information about the last shown advertisement | ||
| * | ||
| * @return ResultInterface | ||
| */ | ||
| public function execute() | ||
| { | ||
| $this->disableAdminUsage(); | ||
| $this->markUserNotified(); | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| protected function _isAllowed() | ||
| { | ||
| return $this->_authorization->isAllowed(static::ADMIN_RESOURCE); | ||
| } | ||
| } |
102 changes: 102 additions & 0 deletions
102
app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/EnableAdminUsage.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\AdminAnalytics\Controller\Adminhtml\Config; | ||
|
|
||
| use Magento\Backend\App\Action; | ||
| use Magento\Framework\App\Action\HttpPostActionInterface; | ||
| use Magento\Framework\Controller\ResultFactory; | ||
| use Magento\AdminAnalytics\Model\ResourceModel\Viewer\Logger as NotificationLogger; | ||
| use Magento\Framework\App\ProductMetadataInterface; | ||
| use Magento\Framework\Controller\ResultInterface; | ||
| use Magento\Config\Model\Config\Factory; | ||
|
|
||
| /** | ||
| * Controller to record that the current admin user has responded to Admin Analytics notice | ||
| */ | ||
| class EnableAdminUsage extends Action implements HttpPostActionInterface | ||
| { | ||
| /** | ||
| * @var Factory | ||
| */ | ||
| private $configFactory; | ||
|
|
||
| /** | ||
| * @var ProductMetadataInterface | ||
| */ | ||
| private $productMetadata; | ||
|
|
||
| /** | ||
| * @var NotificationLogger | ||
| */ | ||
| private $notificationLogger; | ||
|
|
||
| /** | ||
| * @param Action\Context $context | ||
| * @param ProductMetadataInterface $productMetadata | ||
| * @param NotificationLogger $notificationLogger | ||
| * @param Factory $configFactory | ||
| */ | ||
| public function __construct( | ||
| Action\Context $context, | ||
| ProductMetadataInterface $productMetadata, | ||
| NotificationLogger $notificationLogger, | ||
| Factory $configFactory | ||
| ) { | ||
| parent::__construct($context); | ||
| $this->configFactory = $configFactory; | ||
| $this->productMetadata = $productMetadata; | ||
| $this->notificationLogger = $notificationLogger; | ||
| } | ||
|
|
||
| /** | ||
| * Change the value of config/admin/usage/enabled | ||
| */ | ||
| private function enableAdminUsage() | ||
| { | ||
| $configModel = $this->configFactory->create(); | ||
| $configModel->setDataByPath('admin/usage/enabled', 1); | ||
| $configModel->save(); | ||
| } | ||
|
|
||
| /** | ||
| * Log information about the last user response | ||
| * | ||
| * @return ResultInterface | ||
| */ | ||
| private function markUserNotified(): ResultInterface | ||
| { | ||
| $responseContent = [ | ||
| 'success' => $this->notificationLogger->log( | ||
| $this->productMetadata->getVersion() | ||
| ), | ||
| 'error_message' => '' | ||
| ]; | ||
|
|
||
| $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON); | ||
| return $resultJson->setData($responseContent); | ||
| } | ||
|
|
||
| /** | ||
| * Log information about the last shown advertisement | ||
| * | ||
| * @return \Magento\Framework\Controller\ResultInterface | ||
| */ | ||
| public function execute() | ||
| { | ||
| $this->enableAdminUsage(); | ||
| $this->markUserNotified(); | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| protected function _isAllowed() | ||
| { | ||
| return $this->_authorization->isAllowed(static::ADMIN_RESOURCE); | ||
| } | ||
| } |
Oops, something went wrong.