Merge remote-tracking branch 'origin/AC-12302' into spartans_pr_16082025

Author: sumesh-GL

app/code/Magento/UrlRewrite/Test/Fixture/CmsPage.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\UrlRewrite\Test\Fixture;
+
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\PageFactory;
+use Magento\Framework\DataObject;
+use Magento\TestFramework\Fixture\Api\DataMerger;
+use Magento\TestFramework\Fixture\RevertibleDataFixtureInterface;
+
+class CmsPage implements RevertibleDataFixtureInterface
+{
+    private const DEFAULT_DATA = [
+        'title' => 'CMS Test Page',
+        'identifier' => 'cms-test-page',
+        'stores' => [0],
+        'is_active' => 0, // Key difference - disabled by default
+        'content' => '<h1>This is a disabled CMS page</h1><p>This page should not be accessible via GraphQL.</p>',
+        'content_heading' => 'Disabled Page Heading',
+        'page_layout' => '1column',
+        'meta_title' => 'Disabled Page Meta Title',
+        'meta_keywords' => 'disabled, cms, page, test, graphql',
+        'meta_description' => 'This is a disabled CMS page used for GraphQL error handling tests'
+    ];
+
+    /**
+     * @param PageFactory $pageFactory
+     * @param PageRepositoryInterface $pageRepository
+     * @param DataMerger $dataMerger
+     */
+    public function __construct(
+        private readonly PageFactory $pageFactory,
+        private readonly PageRepositoryInterface $pageRepository,
+        private readonly DataMerger $dataMerger,
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply(array $data = []): ?DataObject
+    {
+        $data = $this->dataMerger->merge(self::DEFAULT_DATA, $data);
+
+        $page = $this->pageFactory->create();
+        $page->setTitle($data['title'])
+            ->setIdentifier($data['identifier'])
+            ->setStores($data['stores'])
+            ->setIsActive($data['is_active'])
+            ->setContent($data['content'])
+            ->setContentHeading($data['content_heading'])
+            ->setPageLayout($data['page_layout'])
+            ->setMetaTitle($data['meta_title'])
+            ->setMetaKeywords($data['meta_keywords'])
+            ->setMetaDescription($data['meta_description']);
+
+        $this->pageRepository->save($page);
+
+        return $page;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function revert(DataObject $data): void
+    {
+        $this->pageRepository->delete($data);
+    }
+}

app/code/Magento/UrlRewriteGraphQl/Model/Resolver/Route.php

@@ -1,12 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\UrlRewriteGraphQl\Model\Resolver;
 
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Query\Uid;
@@ -58,19 +59,23 @@ public function resolve(
         );
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         if ($resultArray) {
-            $result = [];
-            if (isset($resultArray['type'])) {
-                $result = $this->entityDataProviderComposite->getData(
-                    $resultArray['type'],
-                    (int)$resultArray['id'],
-                    $info,
-                    $storeId
-                );
+            try {
+                $result = [];
+                if (isset($resultArray['type'])) {
+                    $result = $this->entityDataProviderComposite->getData(
+                        $resultArray['type'],
+                        (int)$resultArray['id'],
+                        $info,
+                        $storeId
+                    );
+                }
+                $result['redirect_code'] = $resultArray['redirect_code'];
+                $result['relative_url'] = $resultArray['relative_url'];
+                $result['type'] = $resultArray['type'];
+                return $result;
+            } catch (NoSuchEntityException) {
+                return null;
             }
-            $result['redirect_code'] = $resultArray['redirect_code'];
-            $result['relative_url'] = $resultArray['relative_url'];
-            $result['type'] = $resultArray['type'];
-            return $result;
         }
         return null;
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/Cms/CmsPageErrorHandlingTest.php

@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Cms;
+
+use Magento\UrlRewrite\Test\Fixture\CmsPage;
+use Magento\TestFramework\Fixture\DataFixture;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test to return category aggregations
+ */
+class CmsPageErrorHandlingTest extends GraphQlAbstract
+{
+    #[
+        DataFixture(
+            CmsPage::class,
+            [
+                'is_active' => 1,
+                "identifier"=>"enabled-test-page"
+            ],
+            as: 'enabled_page'
+        )
+    ]
+    public function testGetEnabledCmsPageReturnsData()
+    {
+        $query = $this->buildCmsPageQuery('enabled-test-page');
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('route', $response);
+        $this->assertEquals('enabled-test-page', $response['route']['relative_url']);
+        $this->assertEquals('CMS_PAGE', $response['route']['type']);
+    }
+
+    #[
+        DataFixture(
+            CmsPage::class,
+            [
+                'is_active' => 0,
+                "identifier"=>"disabled-test-page"
+            ],
+            as: 'enabled_page'
+        )
+    ]
+    public function testGetDisabledCmsPageReturnsData()
+    {
+        $query = $this->buildCmsPageQuery('disabled-test-page');
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayHasKey('route', $response);
+
+        $this->assertNull(
+            $response['route'],
+            'Disabled CMS page should return null instead of throwing error'
+        );
+    }
+
+    /**
+     * Build GraphQL query for CMS page
+     *
+     * @param string $value
+     * @return string
+     */
+    private function buildCmsPageQuery(string $value): string
+    {
+        return <<<QUERY
+{
+ route(url: "{$value}" ) {
+   redirect_code
+   relative_url
+   type
+ }
+}
+QUERY;
+    }
+}