Search index adjustments (#1546)

Author: JohnathonKoster

app/Search/DocTransformer.php

@@ -8,8 +8,19 @@
 
 class DocTransformer implements DocumentTransformer
 {
+    private function normalizeConent($value)
+    {
+        return str($value)
+            ->lower()
+            ->explode(' ')
+            ->map(fn ($word) => Str::singular($word))
+            ->join(' ');
+    }
+
     public function handle(DocumentFragment $fragment, $entry): void
     {
+        $fragment->additionalContextData[] = $this->normalizeConent($entry->title);
+
         // Add some extra details to "additional_context"
         if (Str::containsAll($fragment->content, ['clear', 'cache'])) {
             $fragment->additionalContextData[] = 'delete cache';

app/Search/Listeners/SearchEntriesCreatedListener.php

@@ -88,6 +88,11 @@ public function handle(SearchEntriesCreated $event): void
 
             $data['url'] = $data['search_url'];
 
+            // Clear this out to prevent "too much" from a specific page dominating the results.
+            if (! $data['is_root']) {
+                $data['origin_title'] = null;
+            }
+
             $section->searchEntry->data($data);
         }
     }

config/statamic/search.php

@@ -32,6 +32,7 @@
                 'title',
                 'search_title',
                 'content',
+                'origin_title',
                 'search_content',
                 'additional_context',
                 'hierarchy_lvl0',
@@ -45,15 +46,16 @@
                     'proximity',
                     'attribute',
                     'exactness',
+                    'origin_title:desc',
                     'hierarchy_lvl0:asc',
                 ],
                 'searchableAttributes' => [
+                    'additional_context',
+                    'hierarchy_lvl0',
                     'title',
+                    'origin_title',
                     'search_title',
-                    'content',
                     'search_content',
-                    'additional_context',
-                    'hierarchy_lvl0',
                     'hierarchy_lvl1',
                     'url',
                 ],

resources/views/tabs.antlers.html

@@ -1,16 +1,10 @@
  <div x-data="{ tab: '{{ active }}' }" x-cloak class="mt-2">
     <div class="relative">
-        {{#
-              Don't add tab names to search results. They just clutter it up.
-              Note: this only works when using the `/documentation-search` views.
-        #}}
-        {{ unless is_rendering_search }}
-        <div class="flex space-x bg-[#292D3E] rounded-t-lg inline-flex">
+        <div class="flex space-x bg-[#292D3E] rounded-t-lg inline-flex" data-indexer="ignore">
           {{ foreach:tabs }}
               <button type="button" class="text-sm bg-black  text-gray-dark hover:text-gray-light pt-1.5 pb-1 px-3 rounded-t-md" x-on:click="tab = '{{ key }}'" :class="{ 'bg-[#292D3E] text-gray-light': tab === '{{ key }}' }">{{ value }}</button>
           {{ /foreach:tabs }}
         </div>
-        {{ /unless }}
         {{ foreach:samples }}
             <div class="tab-content" x-show="tab === '{{ key }}'">{{ value }}</div>
         {{ /foreach:samples }}