Skip to content
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

Jump to bottom

Add clear all button in notifications #3893

Merged
merged 11 commits into from
Sep 29, 2023
Merged

Add clear all button in notifications #3893

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
78b1ed9
Add a cleat all button in notifications
CarolineDenis Aug 2, 2023
01ecdb0
Address comments
CarolineDenis Aug 3, 2023
c8f1ee2
Simplify onClick code
CarolineDenis Aug 14, 2023
63be609
Place clear all btn to the top
CarolineDenis Aug 22, 2023
c35ed41
Display clear all btn when 2 notif or more
CarolineDenis Aug 25, 2023
6c161db
Merge branch 'v7.9-dev' into issue-3890
melton-jason Sep 7, 2023
6817b5c
Lint code with ESLint and Prettier
melton-jason Sep 7, 2023
834738b
Merge branch 'v7.9-dev' into issue-3890
grantfitzsimmons Sep 26, 2023
d0a6d53
Merge branch 'production' into issue-3890
grantfitzsimmons Sep 26, 2023
e119397
Display clear all button in dialog footer
CarolineDenis Sep 27, 2023
1c3bb97
Merge remote-tracking branch 'origin/production' into issue-3890
CarolineDenis Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 25 additions & 1 deletion specifyweb/frontend/js_src/lib/components/Notifications/Notifications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,20 @@ export function Notifications({
count: notifications.length,
})
: notificationsText.notificationsLoading();

function handleClearAll() {
if (notifications === undefined) return;
notifications.forEach((notification) => {
ping('/notifications/delete/', {
method: 'POST',
// eslint-disable-next-line @typescript-eslint/naming-convention
body: formData({ message_id: notification.messageId }),
errorMode: 'dismissible',
});
});
setNotifications([]);
}

return (
<>
<MenuButton
Expand All @@ -62,7 +76,17 @@ export function Notifications({
/>
{Array.isArray(notifications) ? (
<Dialog
buttons={commonText.close()}
buttons={
<>
{notifications.length > 1 && (
<Button.Secondary onClick={handleClearAll}>
{commonText.clearAll()}
</Button.Secondary>
)}
<span className="-ml-2 flex-1" />
<Button.DialogClose>{commonText.close()}</Button.DialogClose>
</>
}
className={{
container: `${dialogClassNames.narrowContainer} min-w-[50%]`,
content: `${dialogClassNames.flexContent} gap-3 divide-y divide-gray-500`,
Expand Down