Save partial search keyword indexes for drafts

Author: brandonkelly

CHANGELOG.md

@@ -17,6 +17,8 @@
 - Improved the styling of entry drafts within entry indexes. ([#7517](https://github.com/craftcms/cms/issues/7517))
 - Field groups are now soft-deleted.
 - Color fields’ text inputs are now updated based on the color input’s `input` event rather than `change`. ([#7529](https://github.com/craftcms/cms/issues/7529))
+- Entry drafts’ search keywords now get partially indexed.
+- The `resave/entries` command now supports a `--drafts` flag.
 
 ### Fixed
 - Fixed a bug where saving an entry to a site other than default would return `null` when using the GraphiQL API mutations. ([#7468](https://github.com/craftcms/cms/issues/7468))

src/console/controllers/ResaveController.php

@@ -31,6 +31,12 @@
  */
 class ResaveController extends Controller
 {
+    /**
+     * @var bool Whether to resave element drafts.
+     * @since 3.6.5
+     */
+    public $drafts = false;
+
     /**
      * @var int|string The ID(s) of the elements to resave.
      */
@@ -124,6 +130,7 @@ public function options($actionID)
             case 'entries':
                 $options[] = 'section';
                 $options[] = 'type';
+                $options[] = 'drafts';
                 break;
             case 'matrix-blocks':
                 $options[] = 'field';
@@ -238,6 +245,10 @@ public function saveElements(ElementQueryInterface $query): int
         /** @var ElementInterface $elementType */
         $elementType = $query->elementType;
 
+        if ($this->drafts) {
+            $query->drafts();
+        }
+
         if ($this->elementId) {
             $query->id(is_int($this->elementId) ? $this->elementId : explode(',', $this->elementId));
         }

src/queue/jobs/UpdateSearchIndex.php

@@ -47,6 +47,7 @@ public function execute($queue)
     {
         $class = $this->elementType;
         $elements = $class::find()
+            ->drafts(null)
             ->id($this->elementId)
             ->siteId($this->siteId)
             ->anyStatus()

src/services/Elements.php

@@ -2529,15 +2529,15 @@ private function _saveElementInternal(ElementInterface $element, bool $runValida
         }
 
         // Update search index
-        if ($updateSearchIndex && !$isDraftOrRevision) {
+        if ($updateSearchIndex && !$element->getIsRevision()) {
             if (Craft::$app->getRequest()->getIsConsoleRequest()) {
                 Craft::$app->getSearch()->indexElementAttributes($element);
             } else {
                 Queue::push(new UpdateSearchIndex([
                     'elementType' => get_class($element),
                     'elementId' => $element->id,
                     'siteId' => $propagate ? '*' : $element->siteId,
-                    'fieldHandles' => $element->getDirtyFields(),
+                    'fieldHandles' => $element->getIsDraft() ? [] : $element->getDirtyFields(),
                 ]), 2048);
             }
         }