Revert "Media Gallery configuration are reversed"

konarshankar07 · konarshankar07 · commit 3fc230358a24 · 2020-08-14T13:42:22.000+05:30
This reverts commit 3633542.
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php b/app/code/Magento/MediaGalleryCatalogIntegration/Plugin/SaveBaseCategoryImageInformation.php
@@ -86,7 +86,7 @@ public function __construct(
      */
     public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath): string
     {
-        if ($this->config->isEnabled()) {
+        if (!$this->config->isEnabled()) {
             return $imagePath;
         }
 
diff --git a/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php b/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
@@ -35,6 +35,6 @@ public function __construct(ConfigInterface $config)
      */
     public function getUrl(): string
     {
-        return $this->config->isEnabled() ? 'cms/wysiwyg_images/index' : 'media_gallery/index/index';
+        return $this->config->isEnabled() ? 'media_gallery/index/index' : 'cms/wysiwyg_images/index';
     }
 }
diff --git a/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php b/app/code/Magento/MediaGalleryIntegration/Plugin/SaveImageInformation.php
@@ -78,7 +78,7 @@ public function __construct(
      */
     public function afterSave(Uploader $subject, array $result): array
     {
-        if ($this->config->isEnabled()) {
+        if (!$this->config->isEnabled()) {
             return $result;
         }
 
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/ImageComponentOpenDialogUrlTest.php
@@ -50,7 +50,7 @@ protected function setUp(): void
 
     /**
      * Test image open dialog url when enhanced media gallery not enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -61,7 +61,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test image open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
@@ -45,7 +45,7 @@ protected function setUp(): void
 
     /**
      * Test getting open dialog url with enhanced media gallery disabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -54,7 +54,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test getting open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/TinyMceOpenDialogUrlTest.php
@@ -58,7 +58,7 @@ protected function setUp(): void
 
     /**
      * Test image open dialog url when enhanced media gallery not enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -68,7 +68,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test image open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/WysiwygDefaultConfigOpenDialogUrlTest.php
@@ -58,7 +58,7 @@ protected function setUp(): void
 
     /**
      * Test update wysiwyg editor open dialog url when enhanced media gallery not enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 1
+     * @magentoConfigFixture default/system/media_gallery/enabled 0
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
@@ -70,7 +70,7 @@ public function testWithEnhancedMediaGalleryDisabled(): void
 
     /**
      * Test update wysiwyg editor open dialog url when enhanced media gallery enabled.
-     * @magentoConfigFixture default/system/media_gallery/enabled 0
+     * @magentoConfigFixture default/system/media_gallery/enabled 1
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
diff --git a/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php b/app/code/Magento/MediaGallerySynchronization/Plugin/MediaGallerySyncTrigger.php
@@ -43,7 +43,7 @@ public function afterSave(Value $config, Value $result): Value
     {
         if ($result->getPath() === self::MEDIA_GALLERY_CONFIG_VALUE
             && $result->isValueChanged()
-            && (int) $result->getValue() !== self::MEDIA_GALLERY_ENABLED_VALUE
+            && (int) $result->getValue() === self::MEDIA_GALLERY_ENABLED_VALUE
         ) {
             $this->publish->execute();
         }
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
@@ -9,10 +9,10 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="MediaGalleryConfigDataEnabled">
         <data key="path">system/media_gallery/enabled</data>
-        <data key="value">0</data>
+        <data key="value">1</data>
     </entity>
     <entity name="MediaGalleryConfigDataDisabled">
         <data key="path">system/media_gallery/enabled</data>
-        <data key="value">1</data>
+        <data key="value">0</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/menu.xml
@@ -7,21 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
     <menu>
-        <add id="Magento_MediaGalleryUi::media"
-             title="Media"
-             translate="title"
-             module="Magento_MediaGalleryUi"
-             sortOrder="15"
-             parent="Magento_Backend::content"
-             resource="Magento_Cms::media_gallery"
-             dependsOnConfig="system/media_gallery/enabled"/>
-        <add id="Magento_MediaGalleryUi::media_gallery"
-             title="Media Gallery"
-             translate="title"
-             module="Magento_MediaGalleryUi"
-             sortOrder="0"
-             parent="Magento_MediaGalleryUi::media"
-             action="media_gallery/media/index"
-             resource="Magento_Cms::media_gallery"/>
+        <add id="Magento_MediaGalleryUi::media" title="Media" translate="title" module="Magento_MediaGalleryUi" sortOrder="15" parent="Magento_Backend::content" resource="Magento_Cms::media_gallery" dependsOnConfig="system/media_gallery/enabled"/>
+        <add id="Magento_MediaGalleryUi::media_gallery" title="Media Gallery" translate="title" module="Magento_MediaGalleryUi" sortOrder="0" parent="Magento_MediaGalleryUi::media" action="media_gallery/media/index" resource="Magento_Cms::media_gallery"/>
     </menu>
 </config>
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
@@ -9,9 +9,9 @@
     <system>
         <section id="system">
             <group id="media_gallery" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="0" showInStore="0">
-                <label>Media Gallery</label>
+                <label>Enhanced Media Gallery</label>
                 <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Enable Old Media Gallery</label>
+                    <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <config_path>system/media_gallery/enabled</config_path>
                 </field>

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function __construct(`
`86`	`86`	`*/`
`87`	`87`	`public function afterMoveFileFromTmp(ImageUploader $subject, string $imagePath): string`
`88`	`88`	`{`
`89`		`- if ($this->config->isEnabled()) {`
	`89`	`+ if (!$this->config->isEnabled()) {`
`90`	`90`	`return $imagePath;`
`91`	`91`	`}`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ public function __construct(ConfigInterface $config)`
`35`	`35`	`*/`
`36`	`36`	`public function getUrl(): string`
`37`	`37`	`{`
`38`		`- return $this->config->isEnabled() ? 'cms/wysiwyg_images/index' : 'media_gallery/index/index';`
	`38`	`+ return $this->config->isEnabled() ? 'media_gallery/index/index' : 'cms/wysiwyg_images/index';`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function __construct(`
`78`	`78`	`*/`
`79`	`79`	`public function afterSave(Uploader $subject, array $result): array`
`80`	`80`	`{`
`81`		`- if ($this->config->isEnabled()) {`
	`81`	`+ if (!$this->config->isEnabled()) {`
`82`	`82`	`return $result;`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function afterSave(Value $config, Value $result): Value`
`43`	`43`	`{`
`44`	`44`	`if ($result->getPath() === self::MEDIA_GALLERY_CONFIG_VALUE`
`45`	`45`	`&& $result->isValueChanged()`
`46`		`- && (int) $result->getValue() !== self::MEDIA_GALLERY_ENABLED_VALUE`
	`46`	`+ && (int) $result->getValue() === self::MEDIA_GALLERY_ENABLED_VALUE`
`47`	`47`	`) {`
`48`	`48`	`$this->publish->execute();`
`49`	`49`	`}`