WIP on splitting components

eea · Dec 19, 2022 · 2173559 · 2173559
1 parent a890e6c
commit 2173559
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/searchlib/components/SearchApp/BasicSearchApp.jsx b/searchlib/components/SearchApp/BasicSearchApp.jsx
@@ -50,6 +50,7 @@ export default function BasicSearchApp(props) {
     paramOnSearch = bindOnSearch,
     paramOnAutocomplete = bindOnAutocomplete,
     searchViewComponent,
+    ...rest
   } = props;
 
   const {
@@ -76,6 +77,7 @@ export default function BasicSearchApp(props) {
   return driverInstance ? (
     <SearchProvider config={elasticConfig} driver={driverInstance}>
       <WrappedSearchView
+        {...rest}
         appConfig={appConfig}
         appConfigContext={appConfigContext}
         appName={appName}

diff --git a/searchlib/components/SearchApp/SearchInputApp.jsx b/searchlib/components/SearchApp/SearchInputApp.jsx
@@ -11,18 +11,18 @@ const SearchInputView = (props) => {
     mode = 'view',
     appConfigContext,
     appConfig,
+    onSubmitSearch,
     ...searchContext
   } = props;
 
   const onSubmit = appConfig.url
     ? (searchTerm) => {
-        console.log('submit', searchTerm);
+        onSubmitSearch(searchTerm);
       }
     : undefined;
 
   const onSelectAutocomplete = appConfig.url
     ? (selection, options) => {
-        console.log('onselect', selection, options, searchContext);
         searchContext.setSearchTerm(selection.suggestion);
       }
     : undefined;
@@ -61,7 +61,7 @@ const SearchInputViewWrapper = (props) => {
   );
 };
 
-export default function SearchApp(props) {
+export default function SearchInputApp(props) {
   return (
     <BasicSearchApp {...props} searchViewComponent={SearchInputViewWrapper} />
   );

diff --git a/searchlib/components/SearchApp/useSearchApp.js b/searchlib/components/SearchApp/useSearchApp.js
@@ -46,10 +46,10 @@ export default function useSearchApp({
 
   const onSearch = React.useCallback(
     async (state) => {
+      if (appConfig.url) return {}; // we don't do onSearch if we rely on another page to do the search
+
       setIsLoading(true);
-      // console.log('searching', state);
       const res = await paramOnSearch(appConfig)(state);
-      // console.log('search done', res);
       setIsLoading(false);
       return res;
     },

diff --git a/src/SearchBlock/templates/SearchInputView.jsx b/src/SearchBlock/templates/SearchInputView.jsx
@@ -1,8 +1,23 @@
-import { SearchInputApp } from '@eeacms/search';
 import React from 'react';
 
+import { SearchInputApp } from '@eeacms/search';
+import { useHistory } from 'react-router-dom';
+import { flattenToAppURL } from '@plone/volto/helpers';
+
 function SearchInputView(props) {
-  return <SearchInputApp {...props} />;
+  const { registry, appName } = props;
+  const history = useHistory();
+  const appConfig = registry.searchui[appName];
+  const url = flattenToAppURL(appConfig.url || '');
+
+  return (
+    <SearchInputApp
+      {...props}
+      onSubmitSearch={(searchTerm) => {
+        history.push(`${url}?q=${searchTerm}`);
+      }}
+    />
+  );
 }
 
 SearchInputView.schemaEnhancer = ({ schema }) => {