diff --git a/common/scripts/version.txt b/common/scripts/version.txt index 9ccacbd7cd..11e837dd69 100644 --- a/common/scripts/version.txt +++ b/common/scripts/version.txt @@ -1 +1 @@ -"0.7.110" +"0.7.136" diff --git a/desktop/src/ui/notifications.ts b/desktop/src/ui/notifications.ts index 22d68fd087..c5d9577799 100644 --- a/desktop/src/ui/notifications.ts +++ b/desktop/src/ui/notifications.ts @@ -2,7 +2,7 @@ import { getPersonBySocialId, formatName } from '@hcengineering/contact' import { Ref, TxOperations } from '@hcengineering/core' import notification, { DocNotifyContext, CommonInboxNotification, ActivityInboxNotification, InboxNotification } from '@hcengineering/notification' import { IntlString, addEventListener, translate } from '@hcengineering/platform' -import { getClient, createNotificationsQuery } from '@hcengineering/presentation' +import { getClient } from '@hcengineering/presentation' import { location } from '@hcengineering/ui' import workbench, { workbenchId } from '@hcengineering/workbench' import desktopPreferences, { defaultNotificationPreference } from '@hcengineering/desktop-preferences' @@ -13,8 +13,6 @@ import { IPCMainExposed } from './types' let client: TxOperations -const notificationsQuery = createNotificationsQuery() - async function hydrateNotificationAsYouCan (lastNotification: InboxNotification): Promise<{ title: string, body: string } | undefined> { // Let's try to do our best and figure out from who we have an notification @@ -116,7 +114,7 @@ export function configureNotifications (): void { // because we generate them on a client let initTimestamp = 0 const notificationHistory = new Map() - let newUnreadNotifications = 0 + const newUnreadNotifications = 0 addEventListener(workbench.event.NotifyConnection, async () => { client = getClient() @@ -124,10 +122,11 @@ export function configureNotifications (): void { const inboxClient = InboxNotificationsClientImpl.getClient() - notificationsQuery.query({ read: false, limit: 1000 }, res => { - newUnreadNotifications = res.getResult().length - electronAPI.setBadge(prevUnViewdNotificationsCount + newUnreadNotifications) - }) + // TODO: FIX ME + // notificationsQuery.query({ read: false, limit: 1000 }, res => { + // newUnreadNotifications = res.getResult().length + // electronAPI.setBadge(prevUnViewdNotificationsCount + newUnreadNotifications) + // }) async function handleNotifications (notificationsByContext: Map, InboxNotification[]>): Promise { const inboxData = await getDisplayInboxData(notificationsByContext) diff --git a/plugins/card-resources/src/components/navigator-next/NavigatorCard.svelte b/plugins/card-resources/src/components/navigator-next/NavigatorCard.svelte index be3f78e466..76b86dfddf 100644 --- a/plugins/card-resources/src/components/navigator-next/NavigatorCard.svelte +++ b/plugins/card-resources/src/components/navigator-next/NavigatorCard.svelte @@ -83,6 +83,7 @@ $: clazz = hierarchy.getClass(card._class) as Class & { color?: number } function getCardTitle (card: Card): string { + if ((card?.parentInfo?.length ?? 0) === 0) return card.title const parent = card.parentInfo[card.parentInfo.length - 1] if (parent != null) { return `${card.title} (${parent.title})` diff --git a/plugins/inbox-resources/src/components/InboxNavigation.svelte b/plugins/inbox-resources/src/components/InboxNavigation.svelte index 690bac7afb..759109fd8a 100644 --- a/plugins/inbox-resources/src/components/InboxNavigation.svelte +++ b/plugins/inbox-resources/src/components/InboxNavigation.svelte @@ -131,7 +131,6 @@ items={contexts} highlightIndex={contexts.findIndex((it) => it.card === card?._id)} noScroll - minHeight="5.625rem" kind="full-size" colorsSchema="lumia" lazy={true}