fix(app): Set useSearchResults nextFetchPolicy to cache-and-network to prevent supressing loading state on refetch

Author: nellh

packages/openneuro-app/src/scripts/search/search-container.tsx

@@ -120,8 +120,6 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
   const is_grant_portal = portalContent?.portal || false
   const grant = portalContent?.grant || null
 
-  const [initialLoading, setInitialLoading] = useState(true)
-
   useEffect(() => {
     setDefaultSearch(
       modality,
@@ -142,12 +140,6 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
 
   const { loading, data, fetchMore, variables } = useSearchResults()
 
-  useEffect(() => {
-    if (!loading && data) {
-      setInitialLoading(false)
-    }
-  }, [loading, data])
-
   const loadMore = () => {
     fetchMore({
       variables: {
@@ -285,7 +277,7 @@ const SearchContainer: FC<SearchContainerProps> = ({ portalContent }) => {
           </>
         )}
         renderLoading={() =>
-          (initialLoading || loading)
+          loading
             ? (
               <div className="search-loading">
                 <Loading />

packages/openneuro-app/src/scripts/search/use-search-results.tsx

@@ -404,7 +404,7 @@ export const useSearchResults = () => {
     // fetchPolicy is workaround for stuck loading bug (https://github.com/apollographql/react-apollo/issues/3270#issuecomment-579614837)
     // TODO: find better solution
     fetchPolicy: "cache-and-network",
-    nextFetchPolicy: "cache-first",
+    nextFetchPolicy: "cache-and-network",
     notifyOnNetworkStatusChange: true,
   })
 }