Skip to content

feat(web): add an 'all' option to notification filter #964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2024
Merged

feat(web): add an 'all' option to notification filter #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
926d8e5
feat(web): add an 'all' option to notification filter
pujitm Nov 19, 2024
c3d83b9
fix(web): infinite scroll loop when there's only 1 page of notifications
pujitm Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/components/Notifications/List.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ async function onLoadMore() {
},
});
const incomingCount = incoming?.data.notifications.list.length ?? 0;
if (incomingCount === 0) {
if (incomingCount === 0 || incomingCount < props.pageSize) {
canLoadMore.value = false;
}
}
Expand Down
9 changes: 4 additions & 5 deletions web/components/Notifications/Sidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ const { teleportTarget, determineTeleportTarget } = useTeleport();
const importance = ref<Importance | undefined>(undefined);

const confirmAndArchiveAll = async () => {
if (
confirm('This will archive all notifications on your Unraid server. Continue?')
) {
if (confirm('This will archive all notifications on your Unraid server. Continue?')) {
await archiveAll();
}
};
Expand Down Expand Up @@ -81,7 +79,7 @@ const confirmAndDeleteAll = async () => {
<Select
@update:model-value="
(val) => {
importance = val as Importance;
importance = val === 'all' ? undefined : (val as Importance);
}
"
>
Expand All @@ -91,7 +89,8 @@ const confirmAndDeleteAll = async () => {
<SelectContent :to="teleportTarget">
<SelectGroup>
<SelectLabel>Notification Types</SelectLabel>
<SelectItem :value="Importance.Alert">Alert</SelectItem>
<SelectItem value="all">All Types</SelectItem>
<SelectItem :value="Importance.Alert"> Alert </SelectItem>
<SelectItem :value="Importance.Info">Info</SelectItem>
<SelectItem :value="Importance.Warning">Warning</SelectItem>
</SelectGroup>
Expand Down