Merge remote-tracking branch 'konarshankar07/23297_disable_force_reindex_issue' into 23297

Author: engcom-Charlie

app/code/Magento/Catalog/Model/Category.php

@@ -1159,7 +1159,9 @@ public function reindex()
      */
     public function afterDeleteCommit()
     {
-        $this->reindex();
+        if ($this->getIsActive()) {
+            $this->reindex();
+        }
         return parent::afterDeleteCommit();
     }
 

app/code/Magento/Catalog/Model/ResourceModel/Category.php

@@ -232,7 +232,9 @@ protected function _beforeDelete(\Magento\Framework\DataObject $object)
      */
     protected function _afterDelete(DataObject $object)
     {
-        $this->indexerProcessor->markIndexerAsInvalid();
+        if ($object->getIsActive()) {
+            $this->indexerProcessor->markIndexerAsInvalid();
+        }
         return parent::_afterDelete($object);
     }
 

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Model/Plugin/Category.php

@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Model\ResourceModel\Category as Resource;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
+use Magento\Framework\DataObject;
 
 /**
  * Perform indexer invalidation after a category delete.
@@ -33,12 +34,15 @@ public function __construct(Processor $fulltextIndexerProcessor)
      *
      * @param Resource $subjectCategory
      * @param Resource $resultCategory
+     * @param DataObject $object
      * @return Resource
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterDelete(Resource $subjectCategory, Resource $resultCategory) : Resource
+    public function afterDelete(Resource $subjectCategory, Resource $resultCategory, DataObject $object) : Resource
     {
-        $this->fulltextIndexerProcessor->markIndexerAsInvalid();
+        if ($object->getIsActive()) {
+            $this->fulltextIndexerProcessor->markIndexerAsInvalid();
+        }
 
         return $resultCategory;
     }