Introduced granulated Media Gallery ACL resources

app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php

@@ -10,7 +10,6 @@
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
 use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Delete image folder.

app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php

@@ -65,7 +65,7 @@ public function execute()
         }
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
-        
+
         return $resultJson->setData($result);
     }
 }

app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php

@@ -74,7 +74,7 @@ public function execute()
         }
         /** @var \Magento\Framework\Controller\Result\Json $resultJson */
         $resultJson = $this->resultJsonFactory->create();
-        
+
         return $resultJson->setData($response);
     }
 }

app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkPagesGridTest.xml

@@ -21,10 +21,6 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
         </before>
-        <after>
-            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        </after>
-
         <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
         <actionGroup ref="FillOutCustomCMSPageContentActionGroup" stepKey="fillBasicPageDataForPageWithDefaultStore">
             <argument name="title" value="Unique page title MediaGalleryUi"/>
@@ -37,9 +33,13 @@
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload3"/>
         </actionGroup>
-        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectContentImageInGrid">
-            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="editImage"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
+            <argument name="image" value="UpdatedImageDetails"/>
         </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeViewDetails"/>
+
         <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
         <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="savePage"/>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
@@ -48,21 +48,19 @@
             <argument name="entityName" value="Pages"/>
         </actionGroup>
         <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
-            <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
+            <argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
         </actionGroup>
-
          <actionGroup ref="AdminDeleteCmsPageFromGridActionGroup" stepKey="deleteCmsPage">
             <argument name="urlKey" value="test-page-1"/>
         </actionGroup>
-
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
         <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerfifyEmptyUsedIn"/>
         <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
         <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
 
         <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
-            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+            <argument name="imageName" value="{{UpdatedImageDetails.title}}"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
         <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>

app/code/Magento/MediaGalleryUi/Block/Adminhtml/ImageDetails.php

@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Block\Adminhtml;
+
+use Magento\Backend\Block\Template;
+use Magento\Directory\Helper\Data as DirectoryHelper;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Json\Helper\Data as JsonHelper;
+use Magento\Framework\Serialize\Serializer\Json;
+
+/**
+ * Image details block
+ *
+ * @api
+ */
+class ImageDetails extends Template
+{
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @param Template\Context $context
+     * @param AuthorizationInterface $authorization
+     * @param Json $json
+     * @param array $data
+     * @param JsonHelper|null $jsonHelper
+     * @param DirectoryHelper|null $directoryHelper
+     */
+    public function __construct(
+        Template\Context $context,
+        AuthorizationInterface $authorization,
+        Json $json,
+        array $data = [],
+        ?JsonHelper $jsonHelper = null,
+        ?DirectoryHelper $directoryHelper = null
+    ) {
+        $this->authorization = $authorization;
+        $this->json = $json;
+        parent::__construct($context, $data, $jsonHelper, $directoryHelper);
+    }
+
+    /**
+     * Retrieve actions json
+     *
+     * @return string
+     */
+    public function getActionsJson(): string
+    {
+        $actions = [
+            [
+                'title' => __('Cancel'),
+                'handler' => 'closeModal',
+                'name' => 'cancel',
+                'classes' => 'action-default scalable cancel action-quaternary'
+            ]
+        ];
+
+        if ($this->authorization->isAllowed('Magento_MediaGalleryUiApi::delete_assets')) {
+            $actions[] = [
+                'title' => __('Delete Image'),
+                'handler' => 'deleteImageAction',
+                'name' => 'delete',
+                'classes' => 'action-default scalable delete action-quaternary'
+            ];
+        }
+
+        if ($this->authorization->isAllowed('Magento_MediaGalleryUiApi::edit_assets')) {
+            $actions[] = [
+                'title' => __('Edit Details'),
+                'handler' => 'editImageAction',
+                'name' => 'edit',
+                'classes' => 'action-default scalable edit action-quaternary'
+            ];
+        }
+
+        if ($this->authorization->isAllowed('Magento_MediaGalleryUiApi::insert_assets')) {
+            $actions[] = [
+                'title' => __('Add Image'),
+                'handler' => 'addImage',
+                'name' => 'add-image',
+                'classes' => 'scalable action-primary add-image-action'
+            ];
+        }
+
+        return $this->json->serialize($actions);
+    }
+}

app/code/Magento/MediaGalleryUi/Block/Adminhtml/ImageDetailsStandalone.php

@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Block\Adminhtml;
+
+use Magento\Backend\Block\Template;
+use Magento\Directory\Helper\Data as DirectoryHelperData;
+use Magento\Framework\AuthorizationInterface;
+use Magento\Framework\Json\Helper\Data as JsonHelperData;
+use Magento\Framework\Serialize\Serializer\Json;
+
+/**
+ * Image details block
+ *
+ * @api
+ */
+class ImageDetailsStandalone extends Template
+{
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @param Template\Context $context
+     * @param AuthorizationInterface $authorization
+     * @param Json $json
+     * @param array $data
+     * @param JsonHelperData|null $jsonHelper
+     * @param DirectoryHelperData|null $directoryHelper
+     */
+    public function __construct(
+        Template\Context $context,
+        AuthorizationInterface $authorization,
+        Json $json,
+        array $data = [],
+        ?JsonHelperData $jsonHelper = null,
+        ?DirectoryHelperData $directoryHelper = null
+    ) {
+        $this->authorization = $authorization;
+        $this->json = $json;
+        parent::__construct($context, $data, $jsonHelper, $directoryHelper);
+    }
+
+    /**
+     * Retrieve actions json
+     *
+     * @return string
+     */
+    public function getActionsJson(): string
+    {
+        $standaloneActions = [
+            [
+                'title' => __('Cancel'),
+                'handler' => 'closeModal',
+                'name' => 'cancel',
+                'classes' => 'action-default scalable cancel action-quaternary'
+            ]
+        ];
+
+        if ($this->authorization->isAllowed('Magento_MediaGalleryUiApi::delete_assets')) {
+            $standaloneActions[] = [
+                'title' => __('Delete Image'),
+                'handler' => 'deleteImageAction',
+                'name' => 'delete',
+                'classes' => 'action-default scalable delete action-quaternary'
+            ];
+        }
+
+        if ($this->authorization->isAllowed('Magento_MediaGalleryUiApi::edit_assets')) {
+            $standaloneActions[] = [
+                'title' => __('Edit Details'),
+                'handler' => 'editImageAction',
+                'name' => 'edit',
+                'classes' => 'action-default scalable edit action-quaternary'
+            ];
+        }
+
+        return $this->json->serialize($standaloneActions);
+    }
+}

app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Create.php

@@ -29,7 +29,7 @@ class Create extends Action implements HttpPostActionInterface
     /**
      * @see _isAllowed()
      */
-    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+    public const ADMIN_RESOURCE = 'Magento_MediaGalleryUiApi::create_folder';
 
     /**
      * @var CreateDirectoriesByPathsInterface

app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/Delete.php

@@ -30,7 +30,7 @@ class Delete extends Action implements HttpPostActionInterface
     /**
      * @see _isAllowed()
      */
-    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+    public const ADMIN_RESOURCE = 'Magento_MediaGalleryUiApi::delete_folder';
 
     /**
      * @var DeleteAssetsByPathsInterface

app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Delete.php

@@ -31,7 +31,7 @@ class Delete extends Action implements HttpPostActionInterface
     /**
      * @see _isAllowed()
      */
-    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+    public const ADMIN_RESOURCE = 'Magento_MediaGalleryUiApi::delete_assets';
 
     /**
      * @var DeleteImage

app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/SaveDetails.php

@@ -32,7 +32,7 @@ class SaveDetails extends Action implements HttpPostActionInterface
     /**
      * @see _isAllowed()
      */
-    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+    public const ADMIN_RESOURCE = 'Magento_MediaGalleryUiApi::edit_assets';
 
     /**
      * @var UpdateAsset

app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/Upload.php

@@ -28,7 +28,7 @@ class Upload extends Action implements HttpPostActionInterface
     /**
      * @see _isAllowed()
      */
-    public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+    public const ADMIN_RESOURCE = 'Magento_MediaGalleryUiApi::upload_assets';
 
     /**
      * @var UploadImage