Merge pull request #893 from traPtitech/chores/use-session-search

Retain search condition up to tab session
traPtitech · Apr 17, 2024 · a6447ea · a6447ea
2 parents 9c4c8c7 + b71654c
commit a6447ea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/dashboard/src/libs/localStore.ts b/dashboard/src/libs/localStore.ts
@@ -3,13 +3,18 @@ import { createStore } from 'solid-js/store'
 
 // https://www.solidjs.com/examples/todos
 
-export const createLocalSignal = <T>(name: string, init: T): ReturnType<typeof createSignal<T>> => {
-  const localState = localStorage.getItem(name)
+const createStorageSignal = <T>(name: string, init: T, storage: Storage): ReturnType<typeof createSignal<T>> => {
+  const localState = storage.getItem(name)
   const [state, setState] = createSignal<T>(localState ? JSON.parse(localState) : init)
-  createEffect(() => localStorage.setItem(name, JSON.stringify(state())))
+  createEffect(() => storage.setItem(name, JSON.stringify(state())))
   return [state, setState]
 }
 
+export const createSessionSignal = <T>(name: string, init: T): ReturnType<typeof createSignal<T>> =>
+  createStorageSignal(name, init, sessionStorage)
+export const createLocalSignal = <T>(name: string, init: T): ReturnType<typeof createSignal<T>> =>
+  createStorageSignal(name, init, localStorage)
+
 export const createLocalStore = <T extends {}>(name: string, init: T): ReturnType<typeof createStore<T>> => {
   const localState = localStorage.getItem(name)
   const [state, setState] = createStore<T>(localState ? JSON.parse(localState) : init)

diff --git a/dashboard/src/pages/apps.tsx b/dashboard/src/pages/apps.tsx
@@ -13,7 +13,7 @@ import {
 import type { SelectOption } from '/@/components/templates/Select'
 import { client, getRepositoryCommits, user } from '/@/libs/api'
 import { ApplicationState, type Provider, applicationState, repositoryURLToProvider } from '/@/libs/application'
-import { createLocalSignal } from '/@/libs/localStore'
+import { createSessionSignal } from '/@/libs/localStore'
 import { Button } from '../components/UI/Button'
 import { MaterialSymbols } from '../components/UI/MaterialSymbols'
 import { TabRound } from '../components/UI/TabRound'
@@ -239,7 +239,7 @@ const AppsList: Component<{
 }
 
 export default () => {
-  const [scope, _setScope] = createLocalSignal('apps-scope', GetRepositoriesRequest_Scope.MINE)
+  const [scope, _setScope] = createSessionSignal('apps-scope', GetRepositoriesRequest_Scope.MINE)
   const [isPending, start] = useTransition()
 
   const setScope = (scope: GetRepositoriesRequest_Scope) => {
@@ -248,14 +248,14 @@ export default () => {
     })
   }
 
-  const [statuses, setStatuses] = createLocalSignal(
+  const [statuses, setStatuses] = createSessionSignal(
     'apps-statuses-v1',
     allStatuses.map((s) => s.value),
   )
-  const [provider, setProvider] = createLocalSignal<Provider[]>('apps-provider', ['GitHub', 'GitLab', 'Gitea'])
-  const [query, setQuery] = createLocalSignal('apps-query', '')
-  const [sort, setSort] = createLocalSignal<keyof typeof sortItems>('apps-sort', sortItems.desc.value)
-  const [includeNoApp, setIncludeNoApp] = createLocalSignal('apps-include-no-app', false)
+  const [provider, setProvider] = createSessionSignal<Provider[]>('apps-provider', ['GitHub', 'GitLab', 'Gitea'])
+  const [query, setQuery] = createSessionSignal('apps-query', '')
+  const [sort, setSort] = createSessionSignal<keyof typeof sortItems>('apps-sort', sortItems.desc.value)
+  const [includeNoApp, setIncludeNoApp] = createSessionSignal('apps-include-no-app', false)
 
   const [scrollParentRef, setScrollParentRef] = createSignal<HTMLDivElement>()