Merge pull request #747 from dpc-sdp/feature/search-fixes

[R20-1337][R20-1339] Scope site search to site and content types
dpc-sdp · Aug 7, 2023 · 47d3a08 · 47d3a08
2 parents 9eaaa95 + a5098ff
commit 47d3a08
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/packages/nuxt-ripple/app.config.ts b/packages/nuxt-ripple/app.config.ts
@@ -19,6 +19,7 @@ declare module '@nuxt/schema' {
         rtl?: boolean
       }
       search?: {
+        contentTypes: string[]
         filterFunctions?: Record<
           string,
           (filterConfig: any, values: string[]) => void

diff --git a/packages/ripple-tide-search/app.config.ts b/packages/ripple-tide-search/app.config.ts
@@ -0,0 +1,14 @@
+export default defineAppConfig({
+  ripple: {
+    search: {
+      contentTypes: [
+        'landing_page',
+        'event',
+        'grant',
+        'news',
+        'publication',
+        'publication_page'
+      ]
+    }
+  }
+})
diff --git a/packages/ripple-tide-search/components/TideSearchPage.vue b/packages/ripple-tide-search/components/TideSearchPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue'
-import { useRuntimeConfig, useFetch, useRoute } from '#imports'
+import { useRuntimeConfig, useTideSite, useRoute } from '#imports'
 import useSearchUI from './../composables/useSearchUI'
 import {
   AppSearchFilterConfigItem,
@@ -53,16 +53,8 @@ const props = withDefaults(defineProps<Props>(), {
   }
 })
 
-const route = useRoute()
 const { public: config } = useRuntimeConfig()
-const siteId = config.tide?.site
-
-const { data: site } = useFetch('/api/tide/site', {
-  baseURL: config.apiUrl || '',
-  params: {
-    id: siteId
-  }
-})
+const site = await useTideSite()
 
 const apiConnectorOptions = {
   ...config.tide?.appSearch,
@@ -115,7 +107,7 @@ const getFilterOptions = (field) => {
 </script>
 
 <template>
-  <TideBaseLayout :site="site">
+  <TideBaseLayout>
     <template #aboveBody>
       <RplHeroHeader
         :title="pageTitle"

diff --git a/packages/ripple-tide-search/pages/search.vue b/packages/ripple-tide-search/pages/search.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
 import { AppSearchFilterConfigItem, MappedSearchResult } from '../types'
-import { formatDate } from '#imports'
+import { formatDate, useRuntimeConfig, useAppConfig } from '#imports'
+
+const appConfig = useAppConfig()
+const runtimeConfig = useRuntimeConfig()
 
 const filtersConfig: AppSearchFilterConfigItem[] = [
   {
@@ -15,6 +18,16 @@ const searchDriverOptions = {
   initialState: { resultsPerPage: 10 },
   alwaysSearchOnInitialLoad: true,
   searchQuery: {
+    filters: [
+      {
+        field: 'field_node_site',
+        values: [runtimeConfig.public.tide?.site]
+      },
+      {
+        field: 'type',
+        values: appConfig.ripple?.search?.contentTypes
+      }
+    ],
     search_fields: {
       title: {
         weight: 10