From 456a73f4ab0b945b73fcae3776aff01f1b0ccc86 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Mon, 17 Jul 2023 18:29:35 +0800 Subject: [PATCH 1/3] make library an internal label --- packages/api/src/services/labels.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/api/src/services/labels.ts b/packages/api/src/services/labels.ts index 0fb9e55b1..6caa613e0 100644 --- a/packages/api/src/services/labels.ts +++ b/packages/api/src/services/labels.ts @@ -9,7 +9,12 @@ import { getRepository } from '../entity/utils' import { CreateLabelInput } from '../generated/graphql' import { generateRandomColor } from '../utils/helpers' -const INTERNAL_LABELS_IN_LOWERCASE = ['newsletters', 'favorites', 'rss'] +const INTERNAL_LABELS_IN_LOWERCASE = [ + 'newsletters', + 'favorites', + 'rss', + 'library', +] const isLabelInternal = (name: string): boolean => { return INTERNAL_LABELS_IN_LOWERCASE.includes(name.toLowerCase()) From 76c77fd9f98be303a7f01432167771910be63dcd Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Mon, 17 Jul 2023 20:32:27 +0800 Subject: [PATCH 2/3] update "read later" filter --- apple/OmnivoreKit/Sources/Models/LinkedItemFilter.swift | 2 +- .../web/components/templates/homeFeed/LibraryFilterMenu.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apple/OmnivoreKit/Sources/Models/LinkedItemFilter.swift b/apple/OmnivoreKit/Sources/Models/LinkedItemFilter.swift index 7a21295e2..ff548a666 100644 --- a/apple/OmnivoreKit/Sources/Models/LinkedItemFilter.swift +++ b/apple/OmnivoreKit/Sources/Models/LinkedItemFilter.swift @@ -17,7 +17,7 @@ public extension LinkedItemFilter { case .inbox: return "in:inbox" case .readlater: - return "in:inbox -label:Newsletter" + return "in:library" case .newsletters: return "in:inbox label:Newsletter" case .recommended: diff --git a/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx b/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx index b1f341644..e005fca58 100644 --- a/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx +++ b/packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx @@ -91,7 +91,7 @@ function SavedSearches(props: LibraryFilterMenuProps): JSX.Element { }, { name: 'Read Later', - term: 'in:inbox -label:Newsletter', + term: 'in:library', }, { name: 'Highlights', From 461f44aa0e48f8cc5eb789dff5958ea06c2f07d3 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Tue, 18 Jul 2023 15:39:54 +0800 Subject: [PATCH 3/3] change existing labels with name = library to internal --- .../migrations/0116.do.update_label_library_internal.sql | 9 +++++++++ .../0116.undo.update_label_library_internal.sql | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100755 packages/db/migrations/0116.do.update_label_library_internal.sql create mode 100755 packages/db/migrations/0116.undo.update_label_library_internal.sql diff --git a/packages/db/migrations/0116.do.update_label_library_internal.sql b/packages/db/migrations/0116.do.update_label_library_internal.sql new file mode 100755 index 000000000..e1074322c --- /dev/null +++ b/packages/db/migrations/0116.do.update_label_library_internal.sql @@ -0,0 +1,9 @@ +-- Type: DO +-- Name: update_label_library_internal +-- Description: Update labels table and change labels with name library to internal + +BEGIN; + +UPDATE omnivore.labels SET internal = true WHERE LOWER(name) = 'library'; + +COMMIT; diff --git a/packages/db/migrations/0116.undo.update_label_library_internal.sql b/packages/db/migrations/0116.undo.update_label_library_internal.sql new file mode 100755 index 000000000..1ba0399d2 --- /dev/null +++ b/packages/db/migrations/0116.undo.update_label_library_internal.sql @@ -0,0 +1,9 @@ +-- Type: UNDO +-- Name: update_label_library_internal +-- Description: Update labels table and change labels with name library to internal + +BEGIN; + +UPDATE omnivore.labels SET internal = false WHERE LOWER(name) = 'library'; + +COMMIT;