ACP2E-3941: Updating Store Code Cleared Design Configuration

Author: soklymeach

app/code/Magento/Backend/Plugin/StoreSaveFlushConfig.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+namespace Magento\Backend\Plugin;
+
+use Magento\Backend\Controller\Adminhtml\System\Store\Save;
+use Magento\Backend\Model\View\Result\Redirect;
+use Magento\Framework\App\Cache\TypeListInterface;
+class StoreSaveFlushConfig
+{
+    /**
+     * @var TypeListInterface
+     */
+    private $cacheTypeList;
+
+    /**
+     * @param TypeListInterface $cacheTypeList
+     */
+    public function __construct(
+        TypeListInterface $cacheTypeList
+    ) {
+        $this->cacheTypeList = $cacheTypeList;
+    }
+
+    /**
+     * Flush config cache after store save
+     *
+     * @param Save $subject
+     * @param Redirect $result
+     * @return Redirect
+     */
+    public function afterExecute(Save $subject, $result)
+    {
+        $postData = $subject->getRequest()->getPostValue();
+        if (isset($postData['store_type']) && $postData['store_type'] === 'store') {
+            $this->cacheTypeList->cleanType('config');
+        }
+        return $result;
+    }
+}

app/code/Magento/Backend/Test/Unit/Plugin/StoreSaveFlushConfigTest.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+namespace Magento\Backend\Test\Unit\Plugin;
+
+use Magento\Backend\Plugin\StoreSaveFlushConfig;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Backend\Controller\Adminhtml\System\Store\Save;
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Backend\Model\View\Result\Redirect;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class StoreSaveFlushConfigTest extends TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    private $objectManager;
+
+    /**
+     * @var StoreSaveFlushConfig
+     */
+    private $plugin;
+
+    /**
+     * @var TypeListInterface|MockObject
+     */
+    private $cacheTypeListMock;
+
+    /**
+     * @var Save|MockObject
+     */
+    private $subjectMock;
+
+    /**
+     * @var RequestInterface|MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var Redirect|MockObject
+     */
+    private $resultMock;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->cacheTypeListMock = $this->createMock(TypeListInterface::class);
+        $this->subjectMock = $this->createMock(Save::class);
+        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
+            ->addMethods(['getPostValue'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->resultMock = $this->createMock(Redirect::class);
+        $this->plugin = $this->objectManager->getObject(
+            StoreSaveFlushConfig::class,
+            ['cacheTypeList' => $this->cacheTypeListMock]
+        );
+    }
+
+    public function testAfterExecuteWithStoreTypeStoreClearsConfigCache()
+    {
+        $postData = ['store_type' => 'store'];
+        $this->subjectMock->method('getRequest')->willReturn($this->requestMock);
+        $this->requestMock->method('getPostValue')->willReturn($postData);
+        $this->cacheTypeListMock->expects($this->once())->method('cleanType')->with('config');
+        $result = $this->plugin->afterExecute($this->subjectMock, $this->resultMock);
+        $this->assertSame($this->resultMock, $result);
+    }
+
+    public function testAfterExecuteWithNonStoreTypeDoesNotClearCache()
+    {
+        $postData = ['store_type' => 'website'];
+        $this->subjectMock->method('getRequest')->willReturn($this->requestMock);
+        $this->requestMock->method('getPostValue')->willReturn($postData);
+        $this->cacheTypeListMock->expects($this->never())->method('cleanType');
+        $result = $this->plugin->afterExecute($this->subjectMock, $this->resultMock);
+        $this->assertSame($this->resultMock, $result);
+    }
+}

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -168,4 +168,7 @@
     </type>
     <preference for="CsrfRequestValidator" type="Magento\Backend\App\Request\BackendValidator" />
     <preference for="Magento\Backend\Model\Image\UploadResizeConfigInterface" type="Magento\Backend\Model\Image\UploadResizeConfig" />
+    <type name="Magento\Backend\Controller\Adminhtml\System\Store\Save">
+        <plugin name="backend_store_save_flush_config" type="Magento\Backend\Plugin\StoreSaveFlushConfig" />
+    </type>
 </config>