#29715: Corrected standalone actions and upgrade script

sivaschenko · sivaschenko · commit b3d52559d352 · 2020-09-04T14:39:53.000+01:00
diff --git a/app/code/Magento/MediaGalleryUi/Block/Adminhtml/ImageDetailsStandalone.php b/app/code/Magento/MediaGalleryUi/Block/Adminhtml/ImageDetailsStandalone.php
@@ -0,0 +1,89 @@
+<?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 AuthorizationInterface $authorization
+     * @param Template\Context $context
+     * @param array $data
+     * @param JsonHelperData|null $jsonHelper
+     * @param DirectoryHelperData|null $directoryHelper
+     */
+    public function __construct(
+        AuthorizationInterface $authorization,
+        Json $json,
+        Template\Context $context,
+        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
+    {
+        $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'
+            ];
+        }
+
+        return $this->json->serialize($actions);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Setup/Patch/Data/AddMediaGalleryPermissions.php b/app/code/Magento/MediaGalleryUi/Setup/Patch/Data/AddMediaGalleryPermissions.php
@@ -78,28 +78,30 @@ private function getInsertData(array $roleIds): array
                 ];
             }
         }
+
+        return $data;
     }
 
     /**
      * @inheritdoc
      */
-    public function getAliases()
+    public function getAliases(): array
     {
         return [];
     }
 
     /**
      * @inheritdoc
      */
-    public static function getDependencies()
+    public static function getDependencies(): array
     {
         return [];
     }
 
     /**
      * @inheritdoc
      */
-    public static function getVersion()
+    public static function getVersion(): string
     {
         return '2.4.2';
     }
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_media_index.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/layout/media_gallery_media_index.xml
@@ -10,7 +10,7 @@
     <body>
         <referenceContainer htmlTag="div" htmlClass="media-gallery-container" name="content">
             <uiComponent name="standalone_media_gallery_listing"/>
-	        <block name="image.details" class="Magento\MediaGalleryUi\Block\Adminhtml\ImageDetails" template="Magento_MediaGalleryUi::image_details_standalone.phtml">
+	        <block name="image.details" class="Magento\MediaGalleryUi\Block\Adminhtml\ImageDetailsStandalone" template="Magento_MediaGalleryUi::image_details_standalone.phtml">
                 <arguments>
                     <argument name="imageDetailsUrl" xsi:type="url" path="media_gallery/image/details"/>
                 </arguments>

Original file line number	Diff line number	Diff line change
`@@ -78,28 +78,30 @@ private function getInsertData(array $roleIds): array`
`78`	`78`	`];`
`79`	`79`	`}`
`80`	`80`	`}`
	`81`	`+`
	`82`	`+ return $data;`
`81`	`83`	`}`
`82`	`84`
`83`	`85`	`/**`
`84`	`86`	`* @inheritdoc`
`85`	`87`	`*/`
`86`		`- public function getAliases()`
	`88`	`+ public function getAliases(): array`
`87`	`89`	`{`
`88`	`90`	`return [];`
`89`	`91`	`}`
`90`	`92`
`91`	`93`	`/**`
`92`	`94`	`* @inheritdoc`
`93`	`95`	`*/`
`94`		`- public static function getDependencies()`
	`96`	`+ public static function getDependencies(): array`
`95`	`97`	`{`
`96`	`98`	`return [];`
`97`	`99`	`}`
`98`	`100`
`99`	`101`	`/**`
`100`	`102`	`* @inheritdoc`
`101`	`103`	`*/`
`102`		`- public static function getVersion()`
	`104`	`+ public static function getVersion(): string`
`103`	`105`	`{`
`104`	`106`	`return '2.4.2';`
`105`	`107`	`}`