fix rss sources bookmarks

Author: Chouikane

src/components/Elements/CardWithActions/CardItemWithActions.tsx

@@ -1,22 +1,23 @@
-import React, { useState, useEffect } from 'react'
+import React, { useEffect, useState } from 'react'
+import { BiBookmarkMinus, BiBookmarkPlus } from 'react-icons/bi'
+import { Attributes, trackLinkBookmark, trackLinkUnBookmark } from 'src/lib/analytics'
 import { useBookmarks } from 'src/stores/bookmarks'
-import { BiBookmarkPlus } from 'react-icons/bi'
-import { BiBookmarkMinus } from 'react-icons/bi'
-import { trackLinkBookmark, trackLinkUnBookmark, Attributes } from 'src/lib/analytics'
 import { BaseEntry } from 'src/types'
 
 type CardItemWithActionsProps = {
   item: BaseEntry
   index: number
   source: string
   cardItem: React.ReactNode
+  sourceType?: 'rss' | 'supported'
 }
 
 export const CardItemWithActions = ({
   cardItem,
   item,
   index,
   source,
+  sourceType = 'supported',
 }: CardItemWithActionsProps) => {
   const { bookmarkPost, unbookmarkPost, userBookmarks } = useBookmarks()
   const [isBookmarked, setIsBookmarked] = useState(
@@ -27,6 +28,7 @@ export const CardItemWithActions = ({
       title: item.title,
       url: item.url,
       source,
+      sourceType: sourceType ?? 'rss',
     }
     if (isBookmarked) {
       unbookmarkPost(itemToBookmark)

src/features/bookmarks/components/BookmarksSidebar.tsx

@@ -1,27 +1,24 @@
-import './Sidebar.css'
-import { VscChromeClose } from 'react-icons/vsc'
-import { TiDelete } from 'react-icons/ti'
 import { HiTicket } from 'react-icons/hi'
-import { SiGithub, SiReddit, SiProducthunt, SiYcombinator } from 'react-icons/si'
+import { SiGithub, SiProducthunt, SiReddit, SiYcombinator } from 'react-icons/si'
+import { TiDelete } from 'react-icons/ti'
+import { VscChromeClose } from 'react-icons/vsc'
 import {
-  ProSidebar,
   Menu,
   MenuItem,
-  SubMenu,
-  SidebarHeader,
+  ProSidebar,
   SidebarContent,
+  SidebarHeader,
+  SubMenu,
 } from 'react-pro-sidebar'
 import 'react-pro-sidebar/dist/css/styles.css'
 import { CardLink } from 'src/components/Elements'
-import { trackLinkUnBookmark, Attributes } from 'src/lib/analytics'
+import { Attributes, trackLinkUnBookmark } from 'src/lib/analytics'
 import { useBookmarks } from 'src/stores/bookmarks'
+import { BookmarkedPost } from '../types'
+import './Sidebar.css'
 
 type BookmarkItemProps = {
-  item: {
-    url: string
-    title: string
-    source: string
-  }
+  item: BookmarkedPost
   appendRef?: boolean
 }
 const BookmarkItem = ({ item, appendRef = true }: BookmarkItemProps) => {
@@ -71,7 +68,7 @@ export const BookmarksSidebar = ({ showSidebar, onClose }: BookmarksSidebarTtype
         'freecodecamp',
         'medium',
         'indiehackers',
-      ].indexOf(bm.source) !== -1
+      ].indexOf(bm.source) !== -1 || bm.sourceType === 'rss'
   )
   const conferencesBookmarks = userBookmarks.filter((bm) => bm.source === 'conferences')
   const productsBookmarks = userBookmarks.filter((bm) => bm.source === 'producthunt')

src/features/bookmarks/types/index.ts

@@ -1,5 +1,6 @@
 export type BookmarkedPost = {
-  title: string,
-  source: string,
-  url: string;
+  title: string
+  source: string
+  url: string
+  sourceType: 'rss' | 'supported'
 }

src/features/cards/components/customRssCard/ArticleItem.tsx

@@ -12,6 +12,7 @@ const ArticleItem = (props: BaseItemPropsType<Article>) => {
   return (
     <CardItemWithActions
       source={analyticsTag}
+      sourceType="rss"
       index={index}
       key={index}
       item={item}