vbatts/ntfy
1
0
Fork 0
Code Pull requests Activity

No ripple in dialogs

Browse source
This commit is contained in:
binwiederhier 2023-01-31 22:12:16 -05:00
parent 07cdf2bc7a
commit 180a7df1e7
2 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/server.go
View file

@ -37,11 +37,9 @@ import (
- HIGH Rate limiting: Sensitive endpoints (account/login/change-password/...) - HIGH Rate limiting: Sensitive endpoints (account/login/change-password/...)
- HIGH Docs - HIGH Docs
- HIGH CLI - HIGH CLI
- MEDIUM: Test for expiring messages after reservation removal
- MEDIUM: Test new token endpoints & never-expiring token - MEDIUM: Test new token endpoints & never-expiring token
- MEDIUM: Make sure account endpoints make sense for admins - MEDIUM: Make sure account endpoints make sense for admins
- MEDIUM: Reservation (UI): Show "This topic is reserved" error message when trying to reserve a reserved topic (Thorben)
- MEDIUM: Reservation (UI): Ask for confirmation when removing reservation (deadcade)
- MEDIUM: Reservation table delete button: dialog "keep or delete messages?"
- LOW: UI: Flickering upgrade banner when logging in - LOW: UI: Flickering upgrade banner when logging in
*/ */

74
web/src/components/Navigation.js
View file

@ -276,43 +276,45 @@ const SubscriptionItem = (props) => {
}; };
return ( return (
<ListItemButton onClick={handleClick} selected={props.selected} aria-label={ariaLabel} aria-live="polite"> <>
<ListItemIcon>{icon}</ListItemIcon> <ListItemButton onClick={handleClick} selected={props.selected} aria-label={ariaLabel} aria-live="polite">
<ListItemText primary={displayName} primaryTypographyProps={{ style: { overflow: "hidden", textOverflow: "ellipsis" } }}/> <ListItemIcon>{icon}</ListItemIcon>
{subscription.reservation?.everyone && <ListItemText primary={displayName} primaryTypographyProps={{ style: { overflow: "hidden", textOverflow: "ellipsis" } }}/>
<ListItemIcon edge="end" sx={{ minWidth: "26px" }}> {subscription.reservation?.everyone &&
{subscription.reservation?.everyone === Permission.READ_WRITE && <ListItemIcon edge="end" sx={{ minWidth: "26px" }}>
<Tooltip title={t("prefs_reservations_table_everyone_read_write")}><PermissionReadWrite size="small"/></Tooltip> {subscription.reservation?.everyone === Permission.READ_WRITE &&
} <Tooltip title={t("prefs_reservations_table_everyone_read_write")}><PermissionReadWrite size="small"/></Tooltip>
{subscription.reservation?.everyone === Permission.READ_ONLY && }
<Tooltip title={t("prefs_reservations_table_everyone_read_only")}><PermissionRead size="small"/></Tooltip> {subscription.reservation?.everyone === Permission.READ_ONLY &&
} <Tooltip title={t("prefs_reservations_table_everyone_read_only")}><PermissionRead size="small"/></Tooltip>
{subscription.reservation?.everyone === Permission.WRITE_ONLY && }
<Tooltip title={t("prefs_reservations_table_everyone_write_only")}><PermissionWrite size="small"/></Tooltip> {subscription.reservation?.everyone === Permission.WRITE_ONLY &&
} <Tooltip title={t("prefs_reservations_table_everyone_write_only")}><PermissionWrite size="small"/></Tooltip>
{subscription.reservation?.everyone === Permission.DENY_ALL && }
<Tooltip title={t("prefs_reservations_table_everyone_deny_all")}><PermissionDenyAll size="small"/></Tooltip> {subscription.reservation?.everyone === Permission.DENY_ALL &&
} <Tooltip title={t("prefs_reservations_table_everyone_deny_all")}><PermissionDenyAll size="small"/></Tooltip>
}
</ListItemIcon>
}
{subscription.mutedUntil > 0 &&
<ListItemIcon edge="end" sx={{ minWidth: "26px" }} aria-label={t("nav_button_muted")}>
<Tooltip title={t("nav_button_muted")}><NotificationsOffOutlined /></Tooltip>
</ListItemIcon>
}
<ListItemIcon edge="end" sx={{minWidth: "26px"}}>
<IconButton size="small" onMouseDown={(e) => e.stopPropagation()} onClick={(e) => setMenuAnchorEl(e.currentTarget)}>
<MoreVert fontSize="small"/>
</IconButton>
</ListItemIcon> </ListItemIcon>
} </ListItemButton>
{subscription.mutedUntil > 0 && <Portal>
<ListItemIcon edge="end" sx={{ minWidth: "26px" }} aria-label={t("nav_button_muted")}> <SubscriptionPopup
<Tooltip title={t("nav_button_muted")}><NotificationsOffOutlined /></Tooltip> subscription={subscription}
</ListItemIcon> anchor={menuAnchorEl}
} onClose={() => setMenuAnchorEl(null)}
<ListItemIcon edge="end" sx={{minWidth: "26px"}}> />
<IconButton size="small" onMouseDown={(e) => e.stopPropagation()} onClick={(e) => setMenuAnchorEl(e.currentTarget)}> </Portal>
<MoreVert fontSize="small"/> </>
</IconButton>
<Portal>
<SubscriptionPopup
subscription={subscription}
anchor={menuAnchorEl}
onClose={() => setMenuAnchorEl(null)}
/>
</Portal>
</ListItemIcon>
</ListItemButton>
); );
}; };