Pass down wasInteracted from SearchResultsApp

eea · Dec 19, 2022 · 3407055 · 3407055
1 parent dd917fb
commit 3407055
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/searchlib/components/SearchApp/LandingPageApp.jsx b/searchlib/components/SearchApp/LandingPageApp.jsx
@@ -1,6 +1,6 @@
 import BasicSearchApp from './BasicSearchApp';
 
-function LandingPageView(props) {
+function BoostrapLandingPageView(props) {
   const { appConfig, registry } = props;
 
   const InitialViewComponent =
@@ -11,5 +11,7 @@ function LandingPageView(props) {
 }
 
 export default function LandingPageApp(props) {
-  return <BasicSearchApp {...props} searchViewComponent={LandingPageView} />;
+  return (
+    <BasicSearchApp {...props} searchViewComponent={BoostrapLandingPageView} />
+  );
 }
diff --git a/searchlib/components/SearchApp/SearchInputApp.jsx b/searchlib/components/SearchApp/SearchInputApp.jsx
@@ -6,7 +6,7 @@ import { AppConfigContext } from '@eeacms/search/lib/hocs';
 import BasicSearchApp from './BasicSearchApp';
 import { SearchBox } from '@eeacms/search/components';
 
-const SearchInputView = (props) => {
+const BootstrapSearchInputView = (props) => {
   const {
     mode = 'view',
     appConfigContext,
@@ -56,7 +56,9 @@ const SearchInputView = (props) => {
 const SearchInputViewWrapper = (props) => {
   return (
     <AppConfigContext.Consumer>
-      {(context) => <SearchInputView appConfigContext={context} {...props} />}
+      {(context) => (
+        <BootstrapSearchInputView appConfigContext={context} {...props} />
+      )}
     </AppConfigContext.Consumer>
   );
 };

diff --git a/searchlib/components/SearchApp/SearchResultsApp.jsx b/searchlib/components/SearchApp/SearchResultsApp.jsx
@@ -2,7 +2,7 @@ import { useViews, useSearchContext } from '@eeacms/search/lib/hocs';
 
 import BasicSearchApp from './BasicSearchApp';
 
-function SearchResultsView(props) {
+function BootstrapSearchResultsView(props) {
   const { appConfig, registry } = props;
 
   const searchContext = useSearchContext();
@@ -44,6 +44,12 @@ function SearchResultsView(props) {
   );
 }
 
-export default function LandingPageApp(props) {
-  return <BasicSearchApp {...props} searchViewComponent={SearchResultsView} />;
+export default function SearchResultsApp(props) {
+  return (
+    <BasicSearchApp
+      {...props}
+      wasInteracted={true}
+      searchViewComponent={BootstrapSearchResultsView}
+    />
+  );
 }
diff --git a/searchlib/components/SearchView/FilterAsideContentView.jsx b/searchlib/components/SearchView/FilterAsideContentView.jsx
@@ -115,7 +115,7 @@ export const FilterAsideContentView = (props) => {
             <Grid centered>
               <Grid.Column textAlign="center">
                 <div className="prev-next-paging">
-                  {(!!wasInteracted || !appConfig.showFilters) && <Paging />}
+                  {!!wasInteracted && <Paging />}
                 </div>
               </Grid.Column>
             </Grid>