add filters in moreLikeThis

Author: folland87

client/src/api/authors/more-like-this/index.ts

@@ -1,12 +1,13 @@
 import { authorsIndex, postHeaders } from "../../../config/api";
 import { LIGHT_SOURCE } from "../_utils/constants";
 
-export async function getMoreAuthorsLikeThis(id: string) {
+export async function getMoreAuthorsLikeThis(id: string, filters?: any[]) {
   const body = JSON.stringify({
     _source: LIGHT_SOURCE,
     size: 3,
     query: {
       bool: {
+        ...(filters?.length && { filter: filters }),
         must: [{
           more_like_this: {
             fields: ["domains.label.*"],
@@ -18,7 +19,8 @@ export async function getMoreAuthorsLikeThis(id: string) {
       }
     }
   })
+  console.log(filters, body)
   const res = await fetch(`${authorsIndex}/_search`, { method: 'POST', body, headers: postHeaders })
   const data = await res.json();
   return data?.hits?.hits?.map(({ _source }) => _source) || []
-}
+}

client/src/api/organizations/more-like-this/index.ts

@@ -1,13 +1,13 @@
 import { organizationsIndex, postHeaders } from "../../../config/api";
 import { DEFAULT_FILTERS, LIGHT_SOURCE } from "../_utils/constants";
 
-export async function getMoreOrganizationsLikeThis(id: string) {
+export async function getMoreOrganizationsLikeThis(id: string, filters?: any) {
   const body = JSON.stringify({
     _source: LIGHT_SOURCE,
     size: 3,
     query: {
       bool: {
-        filter: DEFAULT_FILTERS,
+        filter: [...DEFAULT_FILTERS, ...filters],
         must: [{
           more_like_this: {
             fields: ["publications.title.*", "web_content", "patents.title.*", "projects.label.*", "description.*"],
@@ -22,4 +22,4 @@ export async function getMoreOrganizationsLikeThis(id: string) {
   const res = await fetch(`${organizationsIndex}/_search`, { method: 'POST', body, headers: postHeaders })
   const data = await res.json();
   return data?.hits?.hits?.map(({ _source }) => _source) || []
-}
+}

client/src/api/projects/more-like-this/index.tsx

@@ -1,12 +1,13 @@
 import { projectsIndex, postHeaders } from "../../../config/api";
 import { LIGHT_SOURCE } from "../_utils/constants";
 
-export async function getMoreProjectsLikeThis(id: string) {
+export async function getMoreProjectsLikeThis(id: string, filters?: any[]) {
   const body = JSON.stringify({
     _source: LIGHT_SOURCE,
     size: 3,
     query: {
       bool: {
+        ...(filters?.length && {filter: filters}),
         must: [{
           more_like_this: {
             fields: ["label.*", "publications.title.*", "description.*"],
@@ -21,4 +22,4 @@ export async function getMoreProjectsLikeThis(id: string) {
   const res = await fetch(`${projectsIndex}/_search`, { method: 'POST', body, headers: postHeaders })
   const data = await res.json();
   return data?.hits?.hits?.map(({ _source }) => _source) || []
-}
+}

client/src/api/publications/more-like-this/index.ts

@@ -2,20 +2,25 @@ import { publicationsIndex, postHeaders } from "../../../config/api";
 import { LIGHT_SOURCE } from "../_utils/constants";
 
 
-export async function getMorePublicationsLikeThis(id: string) {
+export async function getMorePublicationsLikeThis(id: string, filters?: any[]) {
   const body = JSON.stringify({
     _source: LIGHT_SOURCE,
     size: 3,
     query: {
-      more_like_this: {
-        fields: ["title.default", "domains.label.*"],
-        like: [{ _id: id }],
-        min_term_freq: 1,
-        max_query_terms: 12,
+      bool: {
+        ...(filters?.length && { filter: filters }),
+        must: [{
+          more_like_this: {
+            fields: ["title.default", "domains.label.*"],
+            like: [{ _id: id }],
+            min_term_freq: 1,
+            max_query_terms: 12,
+          },
+        }],
       },
     }
   })
   const res = await fetch(`${publicationsIndex}/_search`, { method: 'POST', body, headers: postHeaders })
   const data = await res.json();
   return data?.hits?.hits?.map(({ _source }) => _source) || []
-}
+}

client/src/components/more-like-this/index.tsx

@@ -49,13 +49,13 @@ const API_MAPPER = {
 type API = keyof typeof API_MAPPER;
 
 
-export default function MoreLikeThis({ id, api }: { id: string, api: API }) {
+export default function MoreLikeThis({ id, api, filters = [] }: { id: string, api: API, filters?: any[] }) {
   const { locale } = useDSFRConfig();
   const intl = createIntl({ locale, messages: messages[locale] })
   const Component = API_MAPPER[api].item;
   const { data: moreLikeThis, isLoading, isError } = useQuery({
-    queryKey: ["moreLike", api, id],
-    queryFn: () => API_MAPPER[api].fn(id),
+    queryKey: ["moreLike", api, id, filters],
+    queryFn: () => API_MAPPER[api].fn(id, filters),
   });
 
   if (isError) return (
@@ -76,4 +76,4 @@ export default function MoreLikeThis({ id, api }: { id: string, api: API }) {
       ) : <Text className="fr-card__detail fr-text--md">{intl.formatMessage({ id: "more-like-this.empty" })}</Text>}
     </>
   )
-}
+}

client/src/pages/authors/[id]/components/author.tsx

@@ -183,7 +183,13 @@ export default function AuthorPage({ data }: { data: Author }) {
                 icon="user-line"
                 show
               >
-                <MoreLikeThis id={data._id} api="authors" />
+                <MoreLikeThis
+                  id={data._id}
+                  api="authors"
+                  filters={[
+                    {bool: {must_not: {terms: {"id.keyword": coAuthors.map((author) => author.value)}}}}
+                  ]}
+                />
               </PageSection>
               <PageSection
                 title="Data JSON"

client/src/pages/organizations/[id]/components/organization.tsx

@@ -264,7 +264,11 @@ export default function OrganizationPresentation({ data }: { data: Organization
                   icon="building-line"
                   show
                 >
-                  <MoreLikeThis id={data._id} api="organizations" />
+                  <MoreLikeThis
+                    id={data._id}
+                    api="organizations"
+                    filters={ [{ term: { "level.keyword": data.level } }] }
+                  />
                 </PageSection>
                 <PageSection title="Data JSON" description="" show={import.meta.env.DEV}>
                   <div>