From 8e64ab1408cf5f9db6e4a506c6b9d203269fc433 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 22 May 2024 06:23:34 -0700
Subject: [PATCH] Default to title-content search

---
 src-ui/messages.xlf                              | 16 ++++++++--------
 .../admin/settings/settings.component.html       |  2 +-
 .../global-search.component.spec.ts              | 15 +++------------
 src-ui/src/app/data/ui-settings.ts               |  2 +-
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf
index b0ffac0e3..625c8c943 100644
--- a/src-ui/messages.xlf
+++ b/src-ui/messages.xlf
@@ -1030,11 +1030,18 @@
           <context context-type="linenumber">212</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="6631288852577115923" datatype="html">
+        <source>Title and content search</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
+          <context context-type="linenumber">216</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1010505078885609376" datatype="html">
         <source>Advanced search</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
-          <context context-type="linenumber">216</context>
+          <context context-type="linenumber">217</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/global-search/global-search.component.html</context>
@@ -1045,13 +1052,6 @@
           <context context-type="linenumber">143</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="6631288852577115923" datatype="html">
-        <source>Title and content search</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/admin/settings/settings.component.html</context>
-          <context context-type="linenumber">217</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="8104421162933956065" datatype="html">
         <source>Notes</source>
         <context-group purpose="location">
diff --git a/src-ui/src/app/components/admin/settings/settings.component.html b/src-ui/src/app/components/admin/settings/settings.component.html
index ab02f42f2..bcab7de33 100644
--- a/src-ui/src/app/components/admin/settings/settings.component.html
+++ b/src-ui/src/app/components/admin/settings/settings.component.html
@@ -213,8 +213,8 @@
               </div>
               <div class="col">
                 <select class="form-select" formControlName="searchLink">
-                  <option [ngValue]="GlobalSearchType.ADVANCED" i18n>Advanced search</option>
                   <option [ngValue]="GlobalSearchType.TITLE_CONTENT" i18n>Title and content search</option>
+                  <option [ngValue]="GlobalSearchType.ADVANCED" i18n>Advanced search</option>
                 </select>
               </div>
             </div>
diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts b/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts
index 023231199..f2a1ac3a6 100644
--- a/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts
+++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts
@@ -504,15 +504,6 @@ describe('GlobalSearchComponent', () => {
     expect(focusSpy).toHaveBeenCalled()
   })
 
-  it('should support explicit advanced search', () => {
-    const qfSpy = jest.spyOn(documentListViewService, 'quickFilter')
-    component.query = 'test'
-    component.runFullSearch()
-    expect(qfSpy).toHaveBeenCalledWith([
-      { rule_type: FILTER_FULLTEXT_QUERY, value: 'test' },
-    ])
-  })
-
   it('should support open in new window', () => {
     const openSpy = jest.spyOn(window, 'open')
     const event = new Event('click')
@@ -539,17 +530,17 @@ describe('GlobalSearchComponent', () => {
     component.query = 'test'
     component.runFullSearch()
     expect(qfSpy).toHaveBeenCalledWith([
-      { rule_type: FILTER_FULLTEXT_QUERY, value: 'test' },
+      { rule_type: FILTER_TITLE_CONTENT, value: 'test' },
     ])
 
     settingsService.set(
       SETTINGS_KEYS.SEARCH_FULL_TYPE,
-      GlobalSearchType.TITLE_CONTENT
+      GlobalSearchType.ADVANCED
     )
     component.query = 'test'
     component.runFullSearch()
     expect(qfSpy).toHaveBeenCalledWith([
-      { rule_type: FILTER_TITLE_CONTENT, value: 'test' },
+      { rule_type: FILTER_FULLTEXT_QUERY, value: 'test' },
     ])
   })
 })
diff --git a/src-ui/src/app/data/ui-settings.ts b/src-ui/src/app/data/ui-settings.ts
index b6bb62217..29ea08786 100644
--- a/src-ui/src/app/data/ui-settings.ts
+++ b/src-ui/src/app/data/ui-settings.ts
@@ -234,6 +234,6 @@ export const SETTINGS: UiSetting[] = [
   {
     key: SETTINGS_KEYS.SEARCH_FULL_TYPE,
     type: 'string',
-    default: GlobalSearchType.ADVANCED,
+    default: GlobalSearchType.TITLE_CONTENT,
   },
 ]