diff --git a/packages/api/src/services/create_user.ts b/packages/api/src/services/create_user.ts index 6ded934b4e..6fd8e20339 100644 --- a/packages/api/src/services/create_user.ts +++ b/packages/api/src/services/create_user.ts @@ -155,7 +155,10 @@ const createDefaultFiltersForUser = async (userId: string): Promise => { const defaultFilters = [ { name: 'Inbox', filter: 'in:inbox' }, - { name: 'Continue Reading', filter: 'in:inbox sort:read-desc is:unread' }, + { + name: 'Continue Reading', + filter: 'in:inbox sort:read-desc is:reading', + }, { name: 'Non-Feed Items', filter: 'in:library' }, { name: 'Highlights', filter: 'has:highlights mode:highlights' }, { name: 'Unlabeled', filter: 'no:label' }, diff --git a/packages/db/elastic_migrations/migrate_from_elastic.py b/packages/db/elastic_migrations/migrate_from_elastic.py index 98bc1a6aad..a27179ddb9 100755 --- a/packages/db/elastic_migrations/migrate_from_elastic.py +++ b/packages/db/elastic_migrations/migrate_from_elastic.py @@ -313,7 +313,7 @@ async def main(): ES_USERNAME, ES_PASSWORD), retry_on_timeout=True) try: - updated_user_ids = [] + # updated_user_ids = [] print(await es_client.info()) @@ -454,8 +454,8 @@ async def main(): library_items.append(library_item) library_items_original_ids.append(doc_id) - if user_id not in updated_user_ids: - updated_user_ids.append(user_id) + # if user_id not in updated_user_ids: + # updated_user_ids.append(user_id) # convert labels to postgres format if 'labels' in source: @@ -551,7 +551,7 @@ async def main(): print('Migration complete', END_TIME) - await assert_data(db_conn, es_client, updated_user_ids, uploaded_files) + # await assert_data(db_conn, es_client, updated_user_ids, uploaded_files) except Exception as err: print('Migration error', err) finally: diff --git a/packages/db/migrations/0130.do.update_continue_reading_filter.sql b/packages/db/migrations/0130.do.update_continue_reading_filter.sql new file mode 100755 index 0000000000..c3e4b21cd8 --- /dev/null +++ b/packages/db/migrations/0130.do.update_continue_reading_filter.sql @@ -0,0 +1,11 @@ +-- Type: DO +-- Name: update_continue_reading_filter +-- Description: Update the filter value in the Continue Reading filter + +BEGIN; + +UPDATE omnivore.filters + SET filter = 'in:inbox sort:read-desc is:reading' + WHERE name = 'Continue Reading' AND default_filter = true; + +COMMIT; diff --git a/packages/db/migrations/0130.undo.update_continue_reading_filter.sql b/packages/db/migrations/0130.undo.update_continue_reading_filter.sql new file mode 100755 index 0000000000..288485f0e1 --- /dev/null +++ b/packages/db/migrations/0130.undo.update_continue_reading_filter.sql @@ -0,0 +1,11 @@ +-- Type: UNDO +-- Name: update_continue_reading_filter +-- Description: Update the filter value in the Continue Reading filter + +BEGIN; + +UPDATE omnivore.filters + SET filter = 'in:inbox sort:read-desc is:unread' + WHERE name = 'Continue Reading' AND default_filter = true; + +COMMIT; diff --git a/packages/web/components/templates/homeFeed/EmptyLibrary.tsx b/packages/web/components/templates/homeFeed/EmptyLibrary.tsx index 04b6df2e08..72da7891bb 100644 --- a/packages/web/components/templates/homeFeed/EmptyLibrary.tsx +++ b/packages/web/components/templates/homeFeed/EmptyLibrary.tsx @@ -167,7 +167,7 @@ export const EmptyLibrary = (props: EmptyLibraryProps) => { switch (props.searchTerm) { case 'in:inbox': return 'inbox' - case 'in:inbox sort:read-desc is:unread': + case 'in:inbox sort:read-desc is:reading': return 'continue' case 'in:library': return 'non-feed'