Skip to content

Fix duplicated inbox app #10236

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 3 commits into from
Nov 21, 2025
Merged

Fix duplicated inbox app #10236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fdf516
Fix duplicated inbox app
ArtyomSavchenko Nov 21, 2025
2ea4af3
Update plugins/workbench-resources/src/components/Workbench.svelte
ArtyomSavchenko Nov 21, 2025
17f92b9
Fix formatting
ArtyomSavchenko Nov 21, 2025
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 models/inbox/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function createModel (builder: Builder): void {
label: inbox.string.Inbox,
icon: inbox.icon.Inbox,
alias: inboxId,
hidden: false,
hidden: true,
component: inbox.component.InboxApplication,
position: 'top',
order: 100
Expand Down
76 changes: 54 additions & 22 deletions plugins/workbench-resources/src/components/Workbench.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,13 @@
import login, { loginId } from '@hcengineering/login'
import notification, { DocNotifyContext, InboxNotification, notificationId } from '@hcengineering/notification'
import { BrowserNotificatator, InboxNotificationsClientImpl } from '@hcengineering/notification-resources'
import inbox, { inboxId } from '@hcengineering/inbox'
import { broadcastEvent, getMetadata, getResource, IntlString, translate } from '@hcengineering/platform'
import {
ActionContext,
ComponentExtensions,
createQuery,
createNotificationsQuery,
getClient,
isAdminUser,
reduceCalls
Expand Down Expand Up @@ -282,6 +284,17 @@
hasInboxNotifications = res
})

let hasNewInboxNotifications = false

$: if (isCommunicationEnabled) {
const notificationCountQuery = createNotificationsQuery()
notificationCountQuery.query({ read: false, limit: 1 }, (res) => {
hasNewInboxNotifications = res.getResult().length > 0
})
} else {
hasNewInboxNotifications = false
}

const doSyncLoc = reduceCalls(async (loc: Location): Promise<void> => {
if (workspaceId !== $location.path[1]) {
tabs = []
Expand Down Expand Up @@ -759,15 +772,17 @@
let inboxPopup: PopupResult | undefined = undefined
let lastLoc: Location | undefined = undefined

$: activeInboxId = isCommunicationEnabled ? inboxId : notificationId

$: inboxProps = {
selected: currentAppAlias === notificationId || inboxPopup !== undefined,
navigator: (currentAppAlias === notificationId || inboxPopup !== undefined) && $deviceInfo.navigator.visible,
notify: hasInboxNotifications,
selected: currentAppAlias === activeInboxId || inboxPopup !== undefined,
navigator: (currentAppAlias === activeInboxId || inboxPopup !== undefined) && $deviceInfo.navigator.visible,
notify: isCommunicationEnabled ? hasInboxNotifications || hasNewInboxNotifications : hasInboxNotifications,
onClick: (e: MouseEvent) => {
if (e.metaKey || e.ctrlKey) return
if (!$deviceInfo.navigator.visible && $deviceInfo.navigator.float && currentAppAlias === notificationId) {
if (!$deviceInfo.navigator.visible && $deviceInfo.navigator.float && currentAppAlias === activeInboxId) {
toggleNav()
} else if (currentAppAlias === notificationId && lastLoc !== undefined) {
} else if (currentAppAlias === activeInboxId && lastLoc !== undefined) {
e.preventDefault()
e.stopPropagation()
navigate(lastLoc)
Expand All @@ -778,7 +793,10 @@
}
}

$: customAppProps = new Map([[notificationId, inboxProps]])
$: customAppProps = new Map([
[notificationId, inboxProps],
[inboxId, inboxProps]
])

defineSeparators('workbench', workbenchSeparators)
defineSeparators('main', mainSeparators)
Expand Down Expand Up @@ -859,22 +877,36 @@
on:click={toggleNav}
/>
</div>
<!-- <ActivityStatus status="active" /> -->
{#if !isExcludedApp(notificationId) && !isCommunicationEnabled}
<NavLink
app={notificationId}
shrink={0}
disabled={!$deviceInfo.navigator.visible &&
$deviceInfo.navigator.float &&
currentAppAlias === notificationId}
>
<AppItem
icon={notification.icon.Notifications}
label={notification.string.Inbox}
{...inboxProps}
on:click={inboxProps.onClick}
/>
</NavLink>
{#if !isExcludedApp(activeInboxId)}
{#if !isCommunicationEnabled}
<NavLink
app={notificationId}
shrink={0}
disabled={!$deviceInfo.navigator.visible &&
$deviceInfo.navigator.float &&
currentAppAlias === notificationId}
>
<AppItem
icon={notification.icon.Notifications}
label={notification.string.Inbox}
{...inboxProps}
on:click={inboxProps.onClick}
/>
</NavLink>
{:else}
<NavLink
app={inboxId}
shrink={0}
disabled={!$deviceInfo.navigator.visible && $deviceInfo.navigator.float && currentAppAlias === inboxId}
>
<AppItem
icon={inbox.icon.Inbox}
label={inbox.string.Inbox}
{...inboxProps}
on:click={inboxProps.onClick}
/>
</NavLink>
{/if}
{/if}
<Applications
{apps}
Expand Down
Loading