🐛 Exclude strikethrough text before indexing #1327 (#2073)

equinor · Feb 28, 2024 · a0e9a44 · a0e9a44
1 parent 2ba1fe6
commit a0e9a44
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/search/IndexSanityContent/events/sanity.ts b/search/IndexSanityContent/events/sanity.ts
@@ -4,12 +4,13 @@ import * as TE from 'fp-ts/lib/TaskEither'
 import { pipe } from 'fp-ts/lib/function'
 import { SanityClient } from '@sanity/client'
 import { Language, Page } from '../../common'
+import { plainTextExcludingStrikeThrough } from '../../common/queryHelpers'
 
 const query = /* groq */ `*[_type match "route_" + $lang + "*" && content->_type == "event" && !(_id in path("drafts.**")) && excludeFromSearch != true] {
   "slug": slug.current,
   _id,
   "content": content->{
-    "title": pt::text(title),
+    "title": ${plainTextExcludingStrikeThrough('title')},
     "ingress": pt::text(ingress),
     "eventDate": eventDate.date,
     "eventDescription": pt::text(content),

diff --git a/search/IndexSanityContent/magazine/sanity.ts b/search/IndexSanityContent/magazine/sanity.ts
@@ -4,6 +4,7 @@ import { pipe } from 'fp-ts/lib/function'
 import { SanityClient } from '@sanity/client'
 import { Language } from '../../common'
 import { MappableAccordionType, MappableTextBlockType } from '../common/mappers'
+import { plainTextExcludingStrikeThrough } from '../../common/queryHelpers'
 
 export enum HeroTypes {
   DEFAULT = 'default',
@@ -23,22 +24,22 @@ const publishDateTimeQuery = /* groq */ `
 export const query = /* groq */ `*[_type == "magazine" && _lang == $lang && !(_id in path("drafts.**")) && excludeFromSearch != true] {
   "slug": slug.current,
   _id,
-  "title": pt::text(title),
+  "title": ${plainTextExcludingStrikeThrough('title')},
   "type": _type,
   "ingress": pt::text(ingress),
   "textBlocks": content[_type == "textBlock"]{
     "_key": _key,
     "title": select(
       isBigText == true =>
-        pt::text(bigTitle),
-        pt::text(title)
+      ${plainTextExcludingStrikeThrough('bigTitle')},
+      ${plainTextExcludingStrikeThrough('title')}
       ),
     "ingress": pt::text(ingress),
     "text": pt::text(text)  // TODO: Do this manually to cover all cases
   },
   "accordions": content[_type == "accordion"] {
     "_key": _key,
-    "title": pt::text(title),
+    "title": ${plainTextExcludingStrikeThrough('title')},
     "ingress": pt::text(ingress),
     "accordionItems":accordion[]{
       "id": _key,

diff --git a/search/IndexSanityContent/topic/sanity.ts b/search/IndexSanityContent/topic/sanity.ts
@@ -4,25 +4,26 @@ import { pipe } from 'fp-ts/lib/function'
 import { SanityClient } from '@sanity/client'
 import { Language } from '../../common'
 import { MappableAccordionType, MappableTextBlockType } from '../common/mappers'
+import { plainTextExcludingStrikeThrough } from '../../common/queryHelpers'
 
 export const query = /* groq */ `*[_type match "route_" + $lang + "*" && content->_type == "page" && !(_id in path("drafts.**")) && excludeFromSearch != true] {
   "slug": slug.current,
   _id,
-  "title": pt::text(content->title),
+  "title": ${plainTextExcludingStrikeThrough('content->title')},
   "type": content->_type,
   "textBlocks": content->content[_type == "textBlock"]{
     "_key": _key,
     "title": select(
       isBigText == true =>
-        pt::text(bigTitle),
-        pt::text(title)
+        ${plainTextExcludingStrikeThrough('bigTitle')},
+        ${plainTextExcludingStrikeThrough('title')}
       ),
     "ingress": pt::text(ingress),
     "text": pt::text(text)  // TODO: Do this manually to cover all cases
   },
   "accordions": content->content[_type == "accordion"] {
     "_key": _key,
-    "title": pt::text(title),
+    "title": ${plainTextExcludingStrikeThrough('title')},
     "ingress": pt::text(ingress),
     "accordionItems":accordion[]{
       "id": _key,

diff --git a/search/common/queryHelpers.ts b/search/common/queryHelpers.ts
@@ -0,0 +1,7 @@
+export const plainTextExcludingStrikeThrough = (blockTextField: string) => {
+  return /* groq */ `
+  pt::text(${blockTextField}[]{
+        ...,
+          children[!("s" in marks)]
+        })`
+}