Merge pull request #480 from performant-software/feature/cdp142_multisearch

CDP #142 - Multisearch

Author: dleadbetter

packages/core-data/src/utils/Peripleo.js

@@ -27,12 +27,15 @@ const filterLayers = (config: RuntimeConfig) => {
 const normalize = (config: RuntimeConfig) => ({
   ...config,
   layers: config.layers || [],
-  typesense: {
-    ...config.typesense,
-    host: config.typesense.host || '443',
-    protocol: config.typesense.protocol || 'https',
-    sort_by: `_text_match:desc${config.typesense.default_sort ? `,${config.typesense.default_sort}:asc` : ''}`
-  },
+  search: _.map(config.search, (search) => ({
+    ...search,
+    typesense: {
+      ...search.typesense,
+      host: search.typesense.host || '443',
+      protocol: search.typesense.protocol || 'https',
+      sort_by: `_text_match:desc${search.typesense.default_sort ? `,${search.typesense.default_sort}:asc` : ''}`
+    }
+  })),
   core_data: {
     ...config.core_data,
 

packages/core-data/src/utils/Typesense.js

@@ -101,7 +101,9 @@ const createTypesenseAdapter = (config: TypesenseConfig, options = {}) => (
           protocol: config.protocol || 'https'
         }
       ],
-      cacheSearchResultsForSeconds: 120
+      cacheSearchResultsForSeconds: 120,
+      connectionTimeoutSeconds: config.connection_timeout,
+      timeoutSeconds: config.timeout
     },
     geoLocationField: 'coordinates',
     additionalSearchParameters: {