Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2877 from omnivore-app/fix/web-sort-subs-alphabetically

Browse Source 
Sort subscriptions by name for now (should allow options in the future)
This commit is contained in:
Jackson Harper
2023-10-09 12:56:07 +08:00
committed by GitHub
parent 8a8caa9c58 859e88dd1a
commit b4528153d3
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/web/components/templates/homeFeed/LibraryFilterMenu.tsx
View File

@ -204,9 +204,7 @@ function Subscriptions(
if (!props.subscriptions) {
return []
}
return props.subscriptions.sort((a, b) =>
b.updatedAt.localeCompare(a.updatedAt)
)
return props.subscriptions.sort((a, b) => a.name.localeCompare(b.name))
}, [props.subscriptions])
useRegisterActions(

6
packages/web/pages/settings/feeds/index.tsx
View File

@ -39,7 +39,7 @@ export default function Rss(): JSX.Element {
}
return subscriptions
.filter((s) => s.status == 'ACTIVE')
.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt))
.sort((a, b) => a.name.localeCompare(b.name))
}, [subscriptions])
async function updateSubscription(): Promise<void> {
@ -199,8 +199,8 @@ export default function Rss(): JSX.Element {
)
setOnPauseId(subscription.id)
}}
deleteTitle="Delete"
editTitle={subscription.status === 'ACTIVE' ? 'Pause' : 'Resume'}
deleteTitle="Unsubscribe"
// editTitle={subscription.status === 'ACTIVE' ? 'Pause' : 'Resume'}
sublineElement={
<SpanBox
css={{

2
packages/web/pages/settings/subscriptions.tsx
View File

@ -40,7 +40,7 @@ export default function SubscriptionsPage(): JSX.Element {
}
return subscriptions
.filter((s) => s.status == 'ACTIVE')
.sort((a, b) => b.updatedAt.localeCompare(a.updatedAt))
.sort((a, b) => a.name.localeCompare(b.name))
}, [subscriptions])
return (