From be94f50ee5f932a6f68e4240f1217caac2e5aa1f Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 26 Aug 2024 14:28:36 +0800 Subject: [PATCH 1/5] Dont show bullet if hiding URLs --- packages/web/components/patterns/ArticleSubtitle.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/web/components/patterns/ArticleSubtitle.tsx b/packages/web/components/patterns/ArticleSubtitle.tsx index d04e32ca3..f7e52bda8 100644 --- a/packages/web/components/patterns/ArticleSubtitle.tsx +++ b/packages/web/components/patterns/ArticleSubtitle.tsx @@ -19,7 +19,10 @@ export function ArticleSubtitle(props: ArticleSubtitleProps): JSX.Element { return ( - {subtitle} {subtitle && • }{' '} + {subtitle}{' '} + {subtitle && !shouldHideUrl(props.href) && ( + • + )}{' '} {!props.hideButton && !shouldHideUrl(props.href) && ( <> Date: Mon, 26 Aug 2024 14:32:43 +0800 Subject: [PATCH 2/5] Add siteName to article so its available on debug page --- packages/web/lib/networking/fragments/articleFragment.ts | 1 + packages/web/lib/networking/library_items/useLibraryItems.tsx | 1 + packages/web/pages/[username]/[slug]/debug.tsx | 2 ++ 3 files changed, 4 insertions(+) diff --git a/packages/web/lib/networking/fragments/articleFragment.ts b/packages/web/lib/networking/fragments/articleFragment.ts index 702db7d57..d201093fa 100644 --- a/packages/web/lib/networking/fragments/articleFragment.ts +++ b/packages/web/lib/networking/fragments/articleFragment.ts @@ -20,6 +20,7 @@ export const articleFragment = gql` description linkId state + siteName wordsCount } ` diff --git a/packages/web/lib/networking/library_items/useLibraryItems.tsx b/packages/web/lib/networking/library_items/useLibraryItems.tsx index 454c96229..16b24511d 100644 --- a/packages/web/lib/networking/library_items/useLibraryItems.tsx +++ b/packages/web/lib/networking/library_items/useLibraryItems.tsx @@ -969,6 +969,7 @@ export type ArticleAttributes = { author?: string image?: string savedAt: string + siteName?: string createdAt: string publishedAt?: string description?: string diff --git a/packages/web/pages/[username]/[slug]/debug.tsx b/packages/web/pages/[username]/[slug]/debug.tsx index 0f4c86eb1..a571a28e1 100644 --- a/packages/web/pages/[username]/[slug]/debug.tsx +++ b/packages/web/pages/[username]/[slug]/debug.tsx @@ -50,6 +50,8 @@ export default function Debug(): JSX.Element { value: article.originalArticleUrl, }) result.push({ name: 'author', value: article.author ?? 'null' }) + result.push({ name: 'siteName', value: article.siteName ?? 'null' }) + result.push({ name: 'image', value: article.image ?? 'null' }) result.push({ name: 'savedAt', value: article.savedAt }) result.push({ name: 'createdAt', value: article.createdAt }) From 6597245b9c26258c70883efda6dc451782619c85 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 26 Aug 2024 15:11:19 +0800 Subject: [PATCH 3/5] Handle siteNames for non url items --- .../patterns/LibraryCards/LibraryListCard.tsx | 2 +- packages/web/lib/textFormatting.ts | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx b/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx index 6681c6abe..e6d053036 100644 --- a/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx +++ b/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx @@ -11,7 +11,7 @@ import { MenuStyle, FLAIR_ICON_NAMES, } from './LibraryCardStyles' -import { siteName } from '../../../lib/textFormatting' +import { shouldHideUrl, siteName } from '../../../lib/textFormatting' import { sortedLabels } from '../../../lib/labelsSort' import { LIBRARY_LEFT_MENU_WIDTH } from '../../templates/navMenu/LibraryMenu' import { LibraryHoverActions } from './LibraryHoverActions' diff --git a/packages/web/lib/textFormatting.ts b/packages/web/lib/textFormatting.ts index 1f4ecf79a..237b0a1da 100644 --- a/packages/web/lib/textFormatting.ts +++ b/packages/web/lib/textFormatting.ts @@ -23,15 +23,22 @@ export const shouldHideUrl = (url: string): boolean => { return false } +const shouldHideSiteName = (siteName: string) => { + const hideNames = ['storage.googleapis.com', 'omnivore.app'] + if (hideNames.indexOf(origin) != -1) { + return true + } + return false +} + export const siteName = ( originalArticleUrl: string, itemUrl: string, siteName?: string ): string => { if (siteName) { - return shouldHideUrl(siteName) ? '' : siteName + return shouldHideSiteName(siteName) ? '' : siteName } - if (shouldHideUrl(originalArticleUrl)) { return '' } From 661deb310a8057f488109aa8d073f73fde3c51a0 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 26 Aug 2024 15:46:58 +0800 Subject: [PATCH 4/5] Fix typo --- packages/web/lib/textFormatting.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/lib/textFormatting.ts b/packages/web/lib/textFormatting.ts index 237b0a1da..4afde4a4d 100644 --- a/packages/web/lib/textFormatting.ts +++ b/packages/web/lib/textFormatting.ts @@ -25,7 +25,7 @@ export const shouldHideUrl = (url: string): boolean => { const shouldHideSiteName = (siteName: string) => { const hideNames = ['storage.googleapis.com', 'omnivore.app'] - if (hideNames.indexOf(origin) != -1) { + if (hideNames.indexOf(siteName) != -1) { return true } return false From dbb115d072a94caedfd3b01f76b879aed8a0c209 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 26 Aug 2024 16:03:05 +0800 Subject: [PATCH 5/5] Remove some unneeded debug --- .../components/templates/library/LibraryContainer.tsx | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packages/web/components/templates/library/LibraryContainer.tsx b/packages/web/components/templates/library/LibraryContainer.tsx index c83bf254d..506402cd5 100644 --- a/packages/web/components/templates/library/LibraryContainer.tsx +++ b/packages/web/components/templates/library/LibraryContainer.tsx @@ -119,16 +119,10 @@ export function LibraryContainer(props: LibraryContainerProps): JSX.Element { isFetchingNextPage, isFetching, fetchNextPage, - fetchPreviousPage, hasNextPage, - status, error: fetchItemsError, } = useGetLibraryItems(props.folder ?? 'home', props.folder, queryInputs) - console.log( - `status ${status}, isLoading: ${isLoading}, isFetching: ${isFetching}` - ) - useEffect(() => { if (queryValue.startsWith('#')) { debouncedFetchSearchResults( @@ -163,7 +157,6 @@ export function LibraryContainer(props: LibraryContainerProps): JSX.Element { }, [router.asPath]) const libraryItems = useMemo(() => { - console.log('library items: ', itemsPages) const items = itemsPages?.pages .flatMap((ad: LibraryItems) => { @@ -1027,8 +1020,6 @@ export function LibraryItemsLayout( isSessionStorage: false, }) - console.log('props.isValidating: ', props.isValidating) - return ( <>