feat: filter adding feeds to lists in lists context menu

RSSNext · Sep 26, 2024 · f96cf01 · f96cf01
1 parent afb79a2
commit f96cf01
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/apps/renderer/src/hooks/biz/useFeedActions.tsx b/apps/renderer/src/hooks/biz/useFeedActions.tsx
@@ -86,26 +86,29 @@ export const useFeedActions = ({
         type: "separator" as const,
         disabled: isEntryList,
       },
-      {
-        type: "text" as const,
-        label: t("sidebar.feed_column.context_menu.add_feeds_to_list"),
-        enabled: !!listList.data?.length,
-        submenu: listList.data?.map((list) => ({
-          label: list.title || "",
-          type: "text",
-          icon: list.image,
-          click() {
-            return addMutation.mutate({
-              feedId,
-              listId: list.id,
-            })
-          },
-        })),
-      },
-      {
-        type: "separator" as const,
-        disabled: isEntryList,
-      },
+      ...(!isList
+        ? [
+            {
+              type: "text" as const,
+              label: t("sidebar.feed_column.context_menu.add_feeds_to_list"),
+              enabled: !!listList.data?.length,
+              submenu: listList.data?.map((list) => ({
+                label: list.title || "",
+                type: "text" as const,
+                click() {
+                  return addMutation.mutate({
+                    feedId,
+                    listId: list.id,
+                  })
+                },
+              })),
+            },
+            {
+              type: "separator" as const,
+              disabled: isEntryList,
+            },
+          ]
+        : []),
       {
         type: "text" as const,
         label: isEntryList ? t("sidebar.feed_actions.edit_feed") : t("sidebar.feed_actions.edit"),

diff --git a/apps/renderer/src/modules/feed-column/category.tsx b/apps/renderer/src/modules/feed-column/category.tsx
@@ -154,7 +154,6 @@ function FeedCategoryImpl({
                   submenu: listList.data?.map((list) => ({
                     label: list.title || "",
                     type: "text",
-                    icon: list.image,
                     click() {
                       return addMutation.mutate({
                         feedIds: ids,