Merge remote-tracking branch 'origin/AC-9157' into spartans_pr_15042024

glo60612 · glo60612 · commit 29868c79845f · 2024-04-29T17:44:13.000+05:30
diff --git a/app/code/Magento/GraphQlResolverCache/Observer/InvalidateGraphQlResolverCacheObserver.php b/app/code/Magento/GraphQlResolverCache/Observer/InvalidateGraphQlResolverCacheObserver.php
@@ -63,6 +63,13 @@ public function execute(Observer $observer)
             return;
         }
 
+        if (($object instanceof  \Magento\Cms\Model\Block
+            || $object instanceof \Magento\Cms\Model\Page)
+            && $object->getData('staging') !== null
+        ) {
+            return;
+        }
+
         if (!$this->cacheState->isEnabled(GraphQlResolverCache::TYPE_IDENTIFIER)) {
             return;
         }
diff --git a/app/code/Magento/GraphQlResolverCache/composer.json b/app/code/Magento/GraphQlResolverCache/composer.json
@@ -5,7 +5,8 @@
     "require": {
         "php": "~8.1.0||~8.2.0||~8.3.0",
         "magento/framework": "*",
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "*",
+        "magento/module-cms": "*"
     },
     "license": [
         "OSL-3.0",

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,13 @@ public function execute(Observer $observer)`
`63`	`63`	`return;`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ if (($object instanceof \Magento\Cms\Model\Block`
	`67`	`+ \|\| $object instanceof \Magento\Cms\Model\Page)`
	`68`	`+ && $object->getData('staging') !== null`
	`69`	`+ ) {`
	`70`	`+ return;`
	`71`	`+ }`
	`72`	`+`
`66`	`73`	`if (!$this->cacheState->isEnabled(GraphQlResolverCache::TYPE_IDENTIFIER)) {`
`67`	`74`	`return;`
`68`	`75`	`}`