From 6f26c54b6279c8c0eb3bf1451bd0e66b21b6c608 Mon Sep 17 00:00:00 2001 From: Athou Date: Mon, 15 Aug 2022 09:28:03 +0200 Subject: [PATCH] add details page for "All" to be be able to get the generated feed url --- .../src/components/sidebar/Tree.tsx | 1 - .../src/pages/app/CategoryDetailsPage.tsx | 39 ++++++++++++------- .../src/pages/app/FeedEntriesPage.tsx | 4 +- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/commafeed-client/src/components/sidebar/Tree.tsx b/commafeed-client/src/components/sidebar/Tree.tsx index 47c5a435..d42b0a20 100644 --- a/commafeed-client/src/components/sidebar/Tree.tsx +++ b/commafeed-client/src/components/sidebar/Tree.tsx @@ -29,7 +29,6 @@ export function Tree() { } const categoryClicked = (e: React.MouseEvent, id: string) => { if (e.detail === 2) { - if (id === Constants.categoryIds.all) return dispatch(redirectToCategoryDetails(id)) } else { dispatch(redirectToCategory(id)) diff --git a/commafeed-client/src/pages/app/CategoryDetailsPage.tsx b/commafeed-client/src/pages/app/CategoryDetailsPage.tsx index b8ee8ec8..0cd68bef 100644 --- a/commafeed-client/src/pages/app/CategoryDetailsPage.tsx +++ b/commafeed-client/src/pages/app/CategoryDetailsPage.tsx @@ -69,6 +69,7 @@ export function CategoryDetailsPage() { }) }, [setValues, category]) + const editable = id !== Constants.categoryIds.all if (!category) return return ( @@ -102,26 +103,34 @@ export function CategoryDetailsPage() { - - - + {editable && ( + <> + + + + + )} - - - + {editable && ( + <> + + + + + )} diff --git a/commafeed-client/src/pages/app/FeedEntriesPage.tsx b/commafeed-client/src/pages/app/FeedEntriesPage.tsx index d3dbf262..9c0d3066 100644 --- a/commafeed-client/src/pages/app/FeedEntriesPage.tsx +++ b/commafeed-client/src/pages/app/FeedEntriesPage.tsx @@ -47,8 +47,6 @@ export function FeedEntriesPage(props: FeedEntriesPageProps) { dispatch(loadEntries({ type: props.sourceType, id })) }, [dispatch, props.sourceType, id, location.state]) - const hideEditButton = props.sourceType === "category" && id === Constants.categoryIds.all - const noSubscriptions = rootCategory && flattenCategoryTree(rootCategory).every(c => c.feeds.length === 0) if (noSubscriptions) return return ( @@ -61,7 +59,7 @@ export function FeedEntriesPage(props: FeedEntriesPageProps) { )} {!sourceWebsiteUrl && {sourceLabel}} - {sourceLabel && !hideEditButton && ( + {sourceLabel && (