Skip to content

fix: fix double ws connection for notifications #17044

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 1 commit into from
Mar 21, 2025
Merged

fix: fix double ws connection for notifications #17044

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 30 additions & 34 deletions site/src/modules/dashboard/Navbar/NavbarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,21 @@ export const NavbarView: FC<NavbarViewProps> = ({

<NavItems className="ml-4" />

<div className="hidden md:flex items-center gap-3 ml-auto">
<div className="flex items-center gap-3 ml-auto">
{proxyContextValue && (
<ProxyMenu proxyContextValue={proxyContextValue} />
<div className="hidden md:block">
<ProxyMenu proxyContextValue={proxyContextValue} />
</div>
)}

<DeploymentDropdown
canViewAuditLog={canViewAuditLog}
canViewOrganizations={canViewOrganizations}
canViewDeployment={canViewDeployment}
canViewHealth={canViewHealth}
/>
<div className="hidden md:block">
<DeploymentDropdown
canViewAuditLog={canViewAuditLog}
canViewOrganizations={canViewOrganizations}
canViewDeployment={canViewDeployment}
canViewHealth={canViewHealth}
/>
</div>

<NotificationsInbox
fetchNotifications={API.getInboxNotifications}
Expand All @@ -78,36 +82,28 @@ export const NavbarView: FC<NavbarViewProps> = ({
/>

{user && (
<UserDropdown
<div className="hidden md:block">
<UserDropdown
user={user}
buildInfo={buildInfo}
supportLinks={supportLinks}
onSignOut={onSignOut}
/>
</div>
)}

<div className="md:hidden">
<MobileMenu
proxyContextValue={proxyContextValue}
user={user}
buildInfo={buildInfo}
supportLinks={supportLinks}
onSignOut={onSignOut}
canViewAuditLog={canViewAuditLog}
canViewOrganizations={canViewOrganizations}
canViewDeployment={canViewDeployment}
canViewHealth={canViewHealth}
/>
)}
</div>

<div className="ml-auto flex items-center gap-3 md:hidden">
<NotificationsInbox
fetchNotifications={API.getInboxNotifications}
markAllAsRead={API.markAllInboxNotificationsAsRead}
markNotificationAsRead={(notificationId) =>
API.updateInboxNotificationReadStatus(notificationId, {
is_read: true,
})
}
/>

<MobileMenu
proxyContextValue={proxyContextValue}
user={user}
supportLinks={supportLinks}
onSignOut={onSignOut}
canViewAuditLog={canViewAuditLog}
canViewOrganizations={canViewOrganizations}
canViewDeployment={canViewDeployment}
canViewHealth={canViewHealth}
/>
</div>
</div>
</div>
);
Expand Down
Loading