Merge pull request #3303 from omnivore-app/fix/default-highlights-query

Update the default Highlights query

packages/api/src/services/create_user.ts

@@ -160,7 +160,7 @@ const createDefaultFiltersForUser =
         filter: 'in:inbox sort:read-desc is:reading',
       },
       { name: 'Non-Feed Items', filter: 'no:subscription' },
-      { name: 'Highlights', filter: 'has:highlights mode:highlights' },
+      { name: 'Highlights', filter: 'in:all has:highlights mode:highlights' },
       { name: 'Unlabeled', filter: 'no:label' },
       { name: 'Oldest First', filter: 'sort:saved-asc' },
       { name: 'Files', filter: 'type:file' },

packages/db/migrations/0152.do.update_highlights_saved_search.sql

@@ -0,0 +1,12 @@
+-- Type: DO
+-- Name: update_highlights_saved_search
+-- Description: Update highlights saved search to use all instead of inbox
+
+BEGIN;
+
+UPDATE omnivore.filters 
+  SET filter = 'in:all has:highlights mode:highlights' 
+  WHERE name = 'Highlights' 
+  AND filter = 'has:highlights mode:highlights' ;
+
+COMMIT;

packages/db/migrations/0152.undo.update_highlights_saved_search.sql

@@ -0,0 +1,12 @@
+-- Type: UNDO
+-- Name: update_highlights_saved_search
+-- Description: Update highlights saved search to use all instead of inbox
+
+BEGIN;
+
+UPDATE omnivore.filters 
+  SET filter = 'has:highlights mode:highlights' 
+  WHERE name = 'Highlights' 
+  AND filter = 'in:all has:highlights mode:highlights' ;
+
+COMMIT;

packages/web/components/templates/homeFeed/EmptyLibrary.tsx

@@ -171,7 +171,9 @@ export const EmptyLibrary = (props: EmptyLibraryProps) => {
           return 'continue'
         case 'no:subscription':
           return 'non-feed'
+        // Handle both cases while we migrate
         case 'has:highlights mode:highlights':
+        case 'in:all has:highlights mode:highlights':
           return 'highlight'
         case 'no:label':
           return 'unlabeled'