Show Back to Search unless NOT from search (#305)

performant-software · Feb 20, 2025 · aa03288 · aa03288
1 parent e125678
commit aa03288
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/client/src/components/ListPage.js b/client/src/components/ListPage.js
@@ -29,7 +29,12 @@ const ListPage = (props: Props) => {
           actions={[{
             as: Link,
             asProps: (item) => ({
-              to: `${location.pathname}/${item.id}`
+              to: {
+                pathname: `${location.pathname}/${item.id}`,
+                state: {
+                  fromList: true,
+                }
+              }
             }),
             name: 'navigate',
             icon: 'arrow alternate circle right outline',

diff --git a/client/src/components/RecordPage.js b/client/src/components/RecordPage.js
@@ -43,7 +43,7 @@ const RecordPage = (props: Props) => {
   const menuBarRef = useRef(null);
   const { height: minHeight } = useSidebar(menuBarRef);
 
-  const { state: { fromSearch } = {} } = location;
+  const { state: { fromList } = {} } = location;
 
   return (
     <Container
@@ -81,7 +81,7 @@ const RecordPage = (props: Props) => {
               { props.renderTitle() }
             </Menu.Item>
           )}
-          { fromSearch && (
+          { !fromList && (
             <Menu.Item
               position='right'
             >

diff --git a/client/src/pages/Search.js b/client/src/pages/Search.js
@@ -177,14 +177,7 @@ const Search = () => {
               >
                 <SearchResults
                   as={Link}
-                  asProps={(document) => ({
-                    to: {
-                      pathname: `/documents/${document.id}`,
-                      state: {
-                        fromSearch: true
-                      }
-                    }
-                  })}
+                  asProps={(document) => ({ to: `/documents/${document.id}` })}
                   link
                   renderDescription={(document) => document.artwork.date_descriptor}
                   renderEmptyList={() => null}