fix query enable

digirati-co-uk · Mar 5, 2024 · 5f32e28 · 5f32e28
1 parent a7327d8
commit 5f32e28
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/services/madoc-ts/src/frontend/site/hooks/use-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-search.ts
@@ -11,7 +11,7 @@ function normalizeDotKey(key: string) {
 }
 
 export function useSearch() {
-  const { projectId, collectionId, manifestId, topic } = useRouteContext();
+  const { projectId, collectionId, manifestId, topic, topicType } = useRouteContext();
   const { fulltext, appliedFacets, page, rscType } = useSearchQuery();
   const {
     project: { searchStrategy, claimGranularity, searchOptions },
@@ -46,6 +46,7 @@ export function useSearch() {
       ? {
           type: 'entity',
           group_id: facet.v,
+          subtype: topicType,
         }
       : {
           type: facet.t,
@@ -84,7 +85,10 @@ export function useSearch() {
           !!rscType ||
           collectionId ||
           manifestId ||
+          topic ||
+          topicType ||
           projectId),
+      staleTime: 0,
     }
   );
 

diff --git a/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts b/services/madoc-ts/src/frontend/site/hooks/use-topic-search.ts
@@ -75,7 +75,13 @@ export function useTopicSearch() {
     {
       enabled:
         !searchFacetConfig.isLoading &&
-        (!!facetsToRequest.length || !!fulltext || fulltext === '' || !!topicFacets || !!rscType || !!topic),
+        (!!facetsToRequest.length ||
+          !!fulltext ||
+          fulltext === '' ||
+          !!topicFacets ||
+          !!rscType ||
+          !!topic ||
+          topicType),
       staleTime: 0,
     }
   );