Fix pagination

eea · Feb 28, 2023 · f0311d6 · f0311d6
1 parent 0c93c8a
commit f0311d6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/searchlib/components/SearchView/FilterAsideContentView.jsx b/searchlib/components/SearchView/FilterAsideContentView.jsx
@@ -71,6 +71,7 @@ export const FilterAsideContentView = (props) => {
   const isLoading = useAtomValue(loadingAtom);
 
   const { showFilters, showFacets, showClusters, showSorting } = appConfig;
+  const showPaging = appConfig.showLandingPage === false ? true : wasInteracted;
 
   return (
     <>
@@ -124,7 +125,7 @@ export const FilterAsideContentView = (props) => {
             <Grid centered>
               <Grid.Column textAlign="center">
                 <div className="prev-next-paging">
-                  {!!wasInteracted && <Paging />}
+                  {!!showPaging && <Paging />}
                 </div>
               </Grid.Column>
             </Grid>

diff --git a/searchlib/components/SearchView/SearchView.jsx b/searchlib/components/SearchView/SearchView.jsx
@@ -4,7 +4,7 @@
 
 import React from 'react';
 
-import { Link, useLocation } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { withAppConfig } from '@eeacms/search/lib/hocs';
 import { Icon } from 'semantic-ui-react';
 import {
@@ -85,7 +85,7 @@ export const SearchView = (props) => {
   const { landingPageURL } = appConfig;
   let backToHome = landingPageURL;
 
-  if (landingPageURL) {
+  if (landingPageURL && landingPageURL.startsWith('http')) {
     const url = new URL(landingPageURL);
     if (url.host === domain) {
       backToHome = url.pathname;

diff --git a/src/SearchBlock/templates/FullView.jsx b/src/SearchBlock/templates/FullView.jsx
@@ -98,7 +98,7 @@ FullView.schemaEnhancer = (props) => {
   const schema = searchResultsSchemaEnhancer(props);
   schema.fieldsets[1].fields.push('showLandingPage');
   schema.properties.showLandingPage = {
-    title: 'Show landing page?',
+    title: 'Show intro statistics?',
     type: 'boolean',
     default: true,
     configPath: 'showLandingPage',

diff --git a/src/SearchBlock/templates/SearchResultsView.jsx b/src/SearchBlock/templates/SearchResultsView.jsx
@@ -25,4 +25,8 @@ export default function SearchResultsView(props) {
   );
 }
 
-SearchResultsView.schemaEnhancer = searchResultsSchemaEnhancer;
+SearchResultsView.schemaEnhancer = (props) => {
+  const schema = searchResultsSchemaEnhancer(props);
+  // schema.fieldsets[0].fields.push('url');
+  return schema;
+};
diff --git a/src/SearchBlock/templates/schema.js b/src/SearchBlock/templates/schema.js
@@ -123,7 +123,6 @@ export const searchResultsSchemaEnhancer = ({ schema, formData }) => {
       configPath: 'landingPageURL',
     },
   };
-  schema.fieldsets[0].fields.push('url');
 
   if (appConfig) {
     const { resultViews } = appConfig;