Merge pull request #79 from magento-cia/2.4.5-develop-2.4-develop-sync-05312022

Sync of 2.4.5-develop with 2.4-develop

Author: dvoskoboinikov

AdobeStockAdminUi/Block/Adminhtml/System/Config/HideAdminAdobeImsStatus.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AdobeStockAdminUi\Block\Adminhtml\System\Config;
+
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Hide Admin Adobe IMS status in admin system config
+ */
+class HideAdminAdobeImsStatus extends Field
+{
+    /**
+     * Hide Admin Adobe IMS enabled/disabled status
+     *
+     * @param AbstractElement $element
+     * @param string $html
+     * @return string
+     */
+    protected function _decorateRowHtml(AbstractElement $element, $html)
+    {
+        $style = ' style="display: none"';
+
+        return '<tr id="row_' . $element->getHtmlId() . '"' . $style .'>' . $html . '</tr>';
+    }
+}

AdobeStockAdminUi/Block/Adminhtml/System/Config/TestConnection.php

@@ -8,10 +8,12 @@
 
 namespace Magento\AdobeStockAdminUi\Block\Adminhtml\System\Config;
 
+use Magento\AdminAdobeIms\Service\ImsConfig;
 use Magento\AdobeImsApi\Api\ConfigInterface;
 use Magento\AdobeStockClientApi\Api\ClientInterface;
 use Magento\Backend\Block\Template\Context;
 use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Data\Form\Element\AbstractElement;
 
 /**
@@ -22,7 +24,7 @@ class TestConnection extends Field
     private const TEST_CONNECTION_PATH = 'adobe_stock/system_config/testconnection';
 
     /**
-     * @inheritdoc
+     * @var string
      */
     protected $_template = 'Magento_AdobeStockAdminUi::system/config/connection.phtml';
 
@@ -37,21 +39,28 @@ class TestConnection extends Field
     private $config;
 
     /**
-     * TestConnection constructor.
-     *
+     * @var ImsConfig
+     */
+    private ImsConfig $adminAdobeImsConfig;
+
+    /**
      * @param ClientInterface $client
      * @param ConfigInterface $config
-     * @param Context         $context
-     * @param array           $data
+     * @param Context $context
+     * @param array $data
+     * @param ImsConfig|null $adminAdobeImsConfig
      */
     public function __construct(
         ClientInterface $client,
         ConfigInterface $config,
         Context $context,
-        array $data = []
+        array $data = [],
+        ?ImsConfig $adminAdobeImsConfig = null
     ) {
         $this->client = $client;
         $this->config = $config;
+        $this->adminAdobeImsConfig = $adminAdobeImsConfig
+            ?? ObjectManager::getInstance()->get(ImsConfig::class);
         parent::__construct($context, $data);
     }
 
@@ -63,8 +72,13 @@ public function __construct(
      */
     public function render(AbstractElement $element): string
     {
-        $element->setData('scope', null);
-        return parent::render($element);
+        // render Test Connection button only if Admin Adobe IMS is disabled
+        if (!$this->adminAdobeImsConfig->enabled()) {
+            $element->setData('scope', null);
+            return parent::render($element);
+        }
+
+        return '';
     }
 
     /**

AdobeStockAdminUi/composer.json

@@ -4,6 +4,7 @@
     "require": {
         "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
+        "magento/module-admin-adobe-ims": "*",
         "magento/module-adobe-ims-api": "*",
         "magento/module-adobe-stock-client-api": "*",
         "magento/module-backend": "*",

AdobeStockAdminUi/etc/adminhtml/system.xml

@@ -15,12 +15,19 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <config_path>adobe_stock/integration/enabled</config_path>
                 </field>
+                <field id="admin_adobe_ims_enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
+                    <label>Enabled Admin Adobe Ims</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <config_path>adobe_ims/integration/admin_enabled</config_path>
+                    <frontend_model>Magento\AdobeStockAdminUi\Block\Adminhtml\System\Config\HideAdminAdobeImsStatus</frontend_model>
+                </field>
                 <field id="api_key" translate="label" type="obscure" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>API Key (Client ID)</label>
                     <config_path>adobe_ims/integration/api_key</config_path>
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <depends>
                         <field id="enabled">1</field>
+                        <field id="admin_adobe_ims_enabled">0</field>
                     </depends>
                 </field>
                 <field id="private_key" translate="label comment" type="obscure" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -29,6 +36,7 @@
                     <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <depends>
                         <field id="enabled">1</field>
+                        <field id="admin_adobe_ims_enabled">0</field>
                     </depends>
                     <comment><![CDATA[Configure an Adobe Stock account on <a href="https://console.adobe.io" target="_blank">adobe.io</a> to get the API Key (Client ID) and Client Secret. You will not be able to use the integration without both the API Key and Client Secret.]]></comment>
                 </field>

AdobeStockClientApi/README.md

@@ -4,10 +4,10 @@ The Magento_AdobeStockClientApi module serves as application program interface (
 
 ## Extensibility
 
-Extension developers can interact with the Magento_AdobeStockClientApi module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/plugins.html).
+Extension developers can interact with the Magento_AdobeStockClientApi module. For more information about the Magento extension mechanism, see [Magento plug-ins](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/plugins.html).
 
-[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.3/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AdobeStockClientApi module.
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_AdobeStockClientApi module.
 
 ## Additional information
 
-For information about significant changes in patch releases, see [2.3.x Release information](https://devdocs.magento.com/guides/v2.3/release-notes/bk-release-notes.html).
+For information about significant changes in patch releases, see [2.4.x Release information](https://devdocs.magento.com/guides/v2.4/release-notes/bk-release-notes.html).

AdobeStockImageAdminUi/view/adminhtml/web/template/signIn.html

@@ -47,6 +47,7 @@
                         class="adobe-sign-out-button"
                         id="adobeImsSignOut"
                         click="logout"
+                        data-bind="visible: !isGlobalSignInEnabled"
                         data-role="signOutBtn"
                         type="button">
                     <span>Sign Out</span>

_metapackage/composer.json

@@ -10,7 +10,6 @@
         "magento/module-adobe-stock-image-api": "*",
         "magento/module-adobe-stock-client": "*",
         "magento/module-adobe-stock-client-api": "*",
-        "magento/module-adobe-stock-admin-ui": "*",
-        "magento/adobe-ims": "*"
+        "magento/module-adobe-stock-admin-ui": "*"
     }
 }