From 588f7d0fdcdcc44fea380c6cd79c2cfad2b84371 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Tue, 13 Aug 2024 23:38:18 +0800
Subject: [PATCH] Use a separate section for search so we can better control
 the folder

---
 .../api/src/services/user_personalization.ts  |  4 +--
 packages/web/next.config.js                   |  4 +++
 packages/web/pages/l/[section].tsx            | 11 ++++++++
 packages/web/pages/settings/shortcuts.tsx     | 26 +++++++++----------
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/packages/api/src/services/user_personalization.ts b/packages/api/src/services/user_personalization.ts
index 66e6ea6e3..17e3077bb 100644
--- a/packages/api/src/services/user_personalization.ts
+++ b/packages/api/src/services/user_personalization.ts
@@ -131,7 +131,7 @@ const userDefaultShortcuts = async (userId: string): Promise<Shortcut[]> => {
           id: label.id,
           type: 'label',
           name: label.name,
-          section: 'library',
+          section: 'search',
           label: label,
           filter: `in:all label:"${label.name}"`,
         }
@@ -166,7 +166,7 @@ const userDefaultShortcuts = async (userId: string): Promise<Shortcut[]> => {
           id: search.id,
           type: 'search',
           name: search.name,
-          section: 'library',
+          section: 'seach',
           filter: search.filter,
         }
       }),
diff --git a/packages/web/next.config.js b/packages/web/next.config.js
index 148e2a34a..637f1bd05 100644
--- a/packages/web/next.config.js
+++ b/packages/web/next.config.js
@@ -69,6 +69,10 @@ const moduleExports = {
       source: '/subscriptions',
       destination: '/l/subscriptions',
     })
+    rewrites.push({
+      source: '/search',
+      destination: '/l/search',
+    })
     rewrites.push({
       source: '/archive',
       destination: '/l/archive',
diff --git a/packages/web/pages/l/[section].tsx b/packages/web/pages/l/[section].tsx
index 2d5e3e4e8..522563e89 100644
--- a/packages/web/pages/l/[section].tsx
+++ b/packages/web/pages/l/[section].tsx
@@ -84,6 +84,17 @@ export default function Home(): JSX.Element {
             showNavigationMenu={showNavigationMenu}
           />
         )
+      case 'search':
+        return (
+          <LibraryContainer
+            folder={undefined}
+            filterFunc={(item) => {
+              console.log('item: ', item)
+              return true
+            }}
+            showNavigationMenu={showNavigationMenu}
+          />
+        )
       case 'archive':
         return (
           <LibraryContainer
diff --git a/packages/web/pages/settings/shortcuts.tsx b/packages/web/pages/settings/shortcuts.tsx
index da3dde540..cc1b14569 100644
--- a/packages/web/pages/settings/shortcuts.tsx
+++ b/packages/web/pages/settings/shortcuts.tsx
@@ -40,6 +40,7 @@ import { useGetLabels } from '../../lib/networking/labels/useLabels'
 import { useGetSavedSearches } from '../../lib/networking/savedsearches/useSavedSearches'
 import {
   Shortcut,
+  ShortcutType,
   useGetShortcuts,
   useResetShortcuts,
   useSetShortcuts,
@@ -220,25 +221,22 @@ const SavedSearches = (props: ListProps) => {
                   <SwitchBox
                     checked={isChecked(search.id)}
                     setChecked={(checked) => {
+                      const item = {
+                        id: search.id,
+                        type: 'search' as ShortcutType,
+                        name: search.name,
+                        section: 'search',
+                        filter: search.filter,
+                      }
                       if (checked) {
                         props.dispatchList({
                           type: 'ADD_ITEM',
-                          item: {
-                            id: search.id,
-                            type: 'search',
-                            name: search.name,
-                            section: 'library',
-                            filter: search.filter,
-                          },
+                          item,
                         })
                       } else {
                         props.dispatchList({
                           type: 'REMOVE_ITEM',
-                          item: {
-                            type: 'search',
-                            section: 'library',
-                            ...search,
-                          },
+                          item,
                         })
                       }
                     }}
@@ -383,9 +381,9 @@ const Labels = (props: ListProps) => {
                         id: label.id,
                         type: 'label',
                         label: label,
-                        section: 'library',
+                        section: 'search',
                         name: label.name,
-                        filter: `label:\"${escapeQuotes(label.name)}\"`,
+                        filter: `in:all label:\"${escapeQuotes(label.name)}\"`,
                       }
                       if (checked) {
                         props.dispatchList({