From bed50716ee84c5633227ac5787609ebbada3fcec Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Mon, 11 Dec 2023 12:22:30 +0800 Subject: [PATCH] show site name on library view on web if site name exists --- .../components/patterns/LibraryCards/LibraryCardStyles.tsx | 7 ++++++- .../components/patterns/LibraryCards/LibraryGridCard.tsx | 2 +- .../components/patterns/LibraryCards/LibraryListCard.tsx | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/web/components/patterns/LibraryCards/LibraryCardStyles.tsx b/packages/web/components/patterns/LibraryCards/LibraryCardStyles.tsx index a27570122..e0b6a545f 100644 --- a/packages/web/components/patterns/LibraryCards/LibraryCardStyles.tsx +++ b/packages/web/components/patterns/LibraryCards/LibraryCardStyles.tsx @@ -137,8 +137,13 @@ const flairIconForLabel = (label: Label): JSX.Element | undefined => { export const siteName = ( originalArticleUrl: string, - itemUrl: string + itemUrl: string, + siteName?: string ): string => { + if (siteName) { + return siteName + } + if (shouldHideUrl(originalArticleUrl)) { return '' } diff --git a/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx b/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx index 0d139fbd3..d2dc3aa8b 100644 --- a/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx +++ b/packages/web/components/patterns/LibraryCards/LibraryGridCard.tsx @@ -183,7 +183,7 @@ const GridImage = (props: GridImageProps): JSX.Element => { const LibraryGridCardContent = (props: LinkedItemCardProps): JSX.Element => { const { isChecked, setIsChecked, item } = props const [menuOpen, setMenuOpen] = useState(false) - const originText = siteName(props.item.originalArticleUrl, props.item.url) + const originText = siteName(props.item.originalArticleUrl, props.item.url, props.item.siteName) const handleCheckChanged = useCallback(() => { const newValue = !isChecked diff --git a/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx b/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx index a3ffda950..ed89b0f3d 100644 --- a/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx +++ b/packages/web/components/patterns/LibraryCards/LibraryListCard.tsx @@ -245,7 +245,7 @@ export function LibraryListCardContent( ): JSX.Element { const [menuOpen, setMenuOpen] = useState(false) const { isChecked, setIsChecked, item } = props - const originText = siteName(props.item.originalArticleUrl, props.item.url) + const originText = siteName(props.item.originalArticleUrl, props.item.url, props.item.siteName) const handleCheckChanged = useCallback(() => { setIsChecked(item.id, !isChecked)