Merge pull request #3234 from omnivore-app/fix/web-site-name

show site name on library view on web if site name exists
omnivore-app · Dec 11, 2023 · 64fd0d7 · 64fd0d7 · vercel · Dec 11, 2023
2 parents d7a2a92 + bed5071
commit 64fd0d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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)