fix(web): Fix query for generic and team member lists (#17115)

* Fix query for generic and team member lists * Add tags to be searchable in gengeric list search * Add title to be searchable in team member list search --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Jan 8, 2025 · 059b816 · 059b816
1 parent bec763d
commit 059b816
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/libs/cms/src/lib/cms.elasticsearch.service.ts b/libs/cms/src/lib/cms.elasticsearch.service.ts
@@ -509,7 +509,9 @@ export class CmsElasticsearchService {
       },
     ]
 
-    let queryString = input.queryString ? input.queryString.toLowerCase() : ''
+    let queryString = input.queryString
+      ? input.queryString.trim().toLowerCase()
+      : ''
 
     if (input.lang === 'is') {
       queryString = queryString.replace('`', '')
@@ -520,6 +522,7 @@ export class CmsElasticsearchService {
         query: queryString + '*',
         fields: ['title^100', 'content'],
         analyze_wildcard: true,
+        default_operator: 'and',
       },
     })
 
@@ -531,15 +534,8 @@ export class CmsElasticsearchService {
           order: SortDirection.DESC,
         },
       },
-      // Sort items with equal values by ascending title order
-      { 'title.sort': { order: SortDirection.ASC } },
     ]
 
-    // Order by score first in case there is a query string
-    if (queryString.length > 0 && queryString !== '*') {
-      sort.unshift('_score')
-    }
-
     if (input.tags && input.tags.length > 0 && input.tagGroups) {
       must = must.concat(
         generateGenericTagGroupQueries(input.tags, input.tagGroups),

diff --git a/libs/cms/src/lib/search/importers/genericListItem.service.ts b/libs/cms/src/lib/search/importers/genericListItem.service.ts
@@ -51,6 +51,10 @@ export class GenericListItemSyncService
             )
           }
 
+          for (const tag of mapped.filterTags ?? []) {
+            contentSections.push(tag.title)
+          }
+
           const content = contentSections.join(' ')
 
           const tags: MappedData['tags'] =

diff --git a/libs/cms/src/lib/search/importers/teamList.service.ts b/libs/cms/src/lib/search/importers/teamList.service.ts
@@ -31,9 +31,18 @@ export class TeamListSyncService implements CmsSyncProvider<ITeamList> {
           const memberEntry = teamListEntry.fields.teamMembers?.find(
             (m) => m.sys.id === member.id,
           )
-          const content = memberEntry?.fields?.intro
-            ? documentToPlainTextString(memberEntry.fields.intro)
-            : ''
+          const contentSection: string[] = []
+
+          contentSection.push(
+            memberEntry?.fields?.intro
+              ? documentToPlainTextString(memberEntry.fields.intro)
+              : '',
+          )
+          if (member.title) {
+            contentSection.push(member.title)
+          }
+
+          const content = contentSection.join(' ')
           teamMembers.push({
             _id: member.id,
             title: member.name,