Advanced search: save command when going back

src/contexts/AdvancedSearchContext.tsx

@@ -58,6 +58,7 @@ export type AdvancedSearchContextStore = {
   filteringReasons: string[],
   errors: string[],
   paging: PaginationInfo,
+  searchCommand: string,
   actions: {
     findUsers: (query: string, pubkey?: string) => void,
     findUserByNupub: (npub: string) => void,
@@ -68,6 +69,7 @@ export type AdvancedSearchContextStore = {
     getRecomendedUsers: (profiles?: PrimalUser[]) => void,
     findFilteredUserByNpub: (npub: string) => void,
     clearSearch: () => void,
+    setSearchCommand: (command: string) => void,
   },
 }
 
@@ -85,6 +87,7 @@ const initialData = {
   mentionedNotes: {},
   filteringReasons: [],
   errors: [],
+  searchCommand: '',
   paging: { ...emptyPaging() },
 };
 
@@ -390,6 +393,8 @@ export function AdvancedSearchProvider(props: { children: JSX.Element }) {
     }
   }
 
+  const setSearchCommand = (command: string) => updateStore('searchCommand', () => command);
+
 // STORES ---------------------------------------
 
 const [store, updateStore] = createStore<AdvancedSearchContextStore>({
@@ -404,6 +409,7 @@ const [store, updateStore] = createStore<AdvancedSearchContextStore>({
     getRecomendedUsers,
     findFilteredUserByNpub,
     clearSearch,
+    setSearchCommand,
   },
 });
 

src/pages/AdvancedSearch.tsx

@@ -2,7 +2,7 @@ import { TextField } from '@kobalte/core/text-field';
 import { Slider } from "@kobalte/core/slider";
 import { Dialog } from '@kobalte/core/dialog';
 
-import { A, useNavigate } from '@solidjs/router';
+import { A, useLocation, useNavigate } from '@solidjs/router';
 import { batch, Component, createEffect, For, onMount, Show } from 'solid-js';
 import { createStore } from 'solid-js/store';
 import Avatar from '../components/Avatar/Avatar';
@@ -29,6 +29,7 @@ import ButtonSecondary from '../components/Buttons/ButtonSecondary';
 import ButtonLink from '../components/Buttons/ButtonLink';
 import { wordsPerMinute } from '../constants';
 import { useSearchContext } from '../contexts/SearchContext';
+import { useAdvancedSearchContext } from '../contexts/AdvancedSearchContext';
 
 export type SearchState = {
   includes: string,
@@ -142,7 +143,7 @@ const scopes: Record<string, () => string> = {
 };
 
 const kinds: Record<string, () => string> = {
-  'Notes': () => 'kind:1',
+  'Notes': () => '',
   'Reads': () => 'kind:30023',
   'Note Replies': () => 'kind:1 filter:replies',
   'Reads Comments': () => 'kind:30023 filter:replies',
@@ -166,6 +167,8 @@ const sortings: Record<string, () => string> = {
 const AdvancedSearch: Component = () => {
   const navigate = useNavigate();
   const search = useSearchContext();
+  const advSearch = useAdvancedSearchContext();
+  const location = useLocation();
 
   const [state, setState] = createStore<SearchState>({
     includes: '',
@@ -213,6 +216,15 @@ const AdvancedSearch: Component = () => {
     e.preventDefault();
   }
 
+  createEffect(() => {
+    if (state.command.length === 0) {
+      setState('command', () => advSearch?.searchCommand || '');
+      return;
+    }
+
+    advSearch?.actions.setSearchCommand(state.command);
+  })
+
   createEffect(() => {
     if (state.timeframe !== 'Custom') {
       setState('customTimeframe', () => ({ since: '', until: '' }));

src/pages/AdvancedSearchResults.tsx

@@ -1,5 +1,5 @@
 import { useNavigate, useParams } from '@solidjs/router';
-import { Component, createSignal, For, Match, onMount, Show, Switch } from 'solid-js';
+import { Component, createEffect, createSignal, For, Match, on, onMount, Show, Switch } from 'solid-js';
 import Loader from '../components/Loader/Loader';
 import Note from '../components/Note/Note';
 import PageTitle from '../components/PageTitle/PageTitle';
@@ -36,6 +36,13 @@ const AdvancedSearchResults: Component = () => {
     search?.actions.findContent(queryString());
   });
 
+
+  createEffect(on(queryString, (v, p) => {
+    if (!v || v === p) return;
+
+    search?.actions.setSearchCommand(v);
+  }))
+
   const feedType = () => [Kind.LongForm].includes(kind()) ?
   'reads' : 'home';
 
@@ -57,7 +64,7 @@ const AdvancedSearchResults: Component = () => {
             />
 
             <ButtonLink
-              onClick={() => navigate('/asearch')}
+              onClick={() => navigate('/asearch', { state: { query: queryString() } })}
             >
               Back to Advanced search
             </ButtonLink>