From 822731c23ce54dbf7999a11e940fb65f70a4b375 Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Tue, 24 Sep 2024 16:31:34 +0400
Subject: [PATCH] Qfix sidebar (#6708)

---
 models/notification/src/index.ts              |   4 +
 models/time/src/plugin.ts                     |   1 -
 .../src/components/Channel.svelte             |   7 +-
 .../src/components/ChannelScrollView.svelte   |   6 +-
 .../src/components/ChannelSidebarView.svelte  |  18 ++-
 .../components/threads/ThreadContent.svelte   |  79 +++++++++++++
 .../src/components/threads/ThreadView.svelte  | 108 +++++-------------
 plugins/chunter-resources/src/navigation.ts   |   7 +-
 plugins/chunter-resources/src/stores.ts       |   3 +
 plugins/chunter/src/index.ts                  |  17 ++-
 .../components/DocNotifyContextCard.svelte    |   1 +
 .../src/components/Notification.svelte        |  39 +++++--
 plugins/notification/src/index.ts             |   4 +
 plugins/time/src/index.ts                     |   3 +-
 plugins/workbench-resources/src/sidebar.ts    |  17 +++
 .../notification-resources/src/index.ts       |  30 +++--
 server/server-pipeline/package.json           |   4 +-
 .../src/internationalization.ts               |   3 +
 18 files changed, 238 insertions(+), 113 deletions(-)
 create mode 100644 plugins/chunter-resources/src/components/threads/ThreadContent.svelte

diff --git a/models/notification/src/index.ts b/models/notification/src/index.ts
index cc076d5782..07a35e3fde 100644
--- a/models/notification/src/index.ts
+++ b/models/notification/src/index.ts
@@ -105,6 +105,10 @@ export class TBrowserNotification extends TDoc implements BrowserNotification {
   onClickLocation?: Location | undefined
   user!: Ref<Account>
   status!: NotificationStatus
+  messageId?: Ref<ActivityMessage>
+  messageClass?: Ref<Class<ActivityMessage>>
+  objectId!: Ref<Doc>
+  objectClass!: Ref<Class<Doc>>
 }
 
 @Model(notification.class.PushSubscription, core.class.Doc, DOMAIN_USER_NOTIFY)
diff --git a/models/time/src/plugin.ts b/models/time/src/plugin.ts
index 28c07b59e2..19b134da99 100644
--- a/models/time/src/plugin.ts
+++ b/models/time/src/plugin.ts
@@ -34,7 +34,6 @@ export default mergeIds(timeId, time, {
     EditToDo: '' as IntlString,
     GotoTimePlaning: '' as IntlString,
     GotoTimeTeamPlaning: '' as IntlString,
-    NewToDo: '' as IntlString,
     Priority: '' as IntlString,
     MarkedAsDone: '' as IntlString
   },
diff --git a/plugins/chunter-resources/src/components/Channel.svelte b/plugins/chunter-resources/src/components/Channel.svelte
index eb43c295af..b07c21d2df 100644
--- a/plugins/chunter-resources/src/components/Channel.svelte
+++ b/plugins/chunter-resources/src/components/Channel.svelte
@@ -31,14 +31,15 @@
   export let isAsideOpened = false
   export let syncLocation = true
   export let freeze = false
+  export let selectedMessageId: Ref<ActivityMessage> | undefined = undefined
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
 
   let dataProvider: ChannelDataProvider | undefined
-  let selectedMessageId: Ref<ActivityMessage> | undefined = undefined
 
   const unsubscribe = messageInFocus.subscribe((id) => {
+    if (!syncLocation) return
     if (id !== undefined && id !== selectedMessageId) {
       selectedMessageId = id
     }
@@ -47,9 +48,7 @@
   })
 
   const unsubscribeLocation = locationStore.subscribe((newLocation) => {
-    if (!syncLocation) {
-      return
-    }
+    if (!syncLocation) return
     const id = getMessageFromLoc(newLocation)
     selectedMessageId = id
     messageInFocus.set(id)
diff --git a/plugins/chunter-resources/src/components/ChannelScrollView.svelte b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
index 1863acb886..7b154a99b0 100644
--- a/plugins/chunter-resources/src/components/ChannelScrollView.svelte
+++ b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
@@ -582,13 +582,13 @@
   }
 
   async function restoreScroll () {
-    if (!scrollElement || !scroller) {
+    await wait()
+
+    if (!scrollElement || !scroller || scrollToRestore === 0) {
       scrollToRestore = 0
       return
     }
 
-    await wait()
-
     const delta = scrollElement.scrollHeight - scrollToRestore
 
     scroller.scrollBy(delta)
diff --git a/plugins/chunter-resources/src/components/ChannelSidebarView.svelte b/plugins/chunter-resources/src/components/ChannelSidebarView.svelte
index 440f363341..920eb30fe9 100644
--- a/plugins/chunter-resources/src/components/ChannelSidebarView.svelte
+++ b/plugins/chunter-resources/src/components/ChannelSidebarView.svelte
@@ -18,7 +18,9 @@
   import { DocNotifyContext } from '@hcengineering/notification'
   import { InboxNotificationsClientImpl } from '@hcengineering/notification-resources'
   import { Widget } from '@hcengineering/workbench'
+  import { ActivityMessage } from '@hcengineering/activity'
   import { ChatWidgetTab } from '@hcengineering/chunter'
+  import { updateTabData } from '@hcengineering/workbench-resources'
 
   import Channel from './Channel.svelte'
   import { closeThreadInSidebarChannel } from '../navigation'
@@ -36,12 +38,18 @@
 
   let object: Doc | undefined = undefined
   let context: DocNotifyContext | undefined = undefined
+  let selectedMessageId: Ref<ActivityMessage> | undefined = tab.data.selectedMessageId
 
   $: context = object ? $contextByDocStore.get(object._id) : undefined
   $: void loadObject(tab.data._id, tab.data._class)
 
   $: threadId = tab.data.thread
 
+  $: if (tab.data.selectedMessageId !== undefined && tab.data.selectedMessageId !== '') {
+    selectedMessageId = tab.data.selectedMessageId
+    updateTabData(widget._id, tab.id, { selectedMessageId: '' })
+  }
+
   async function loadObject (_id?: Ref<Doc>, _class?: Ref<Class<Doc>>): Promise<void> {
     if (_id === undefined || _class === undefined) {
       object = undefined
@@ -80,13 +88,19 @@
       on:close
     />
     {#key object._id}
-      <Channel {object} {context} syncLocation={false} freeze={threadId !== undefined} />
+      <Channel {object} {context} syncLocation={false} freeze={threadId !== undefined} {selectedMessageId} />
     {/key}
   </div>
 {/if}
 {#if threadId}
   <div class="thread" style:height style:width>
-    <ThreadView _id={threadId} on:channel={() => closeThreadInSidebarChannel(widget, tab)} on:close />
+    <ThreadView
+      _id={threadId}
+      {selectedMessageId}
+      syncLocation={false}
+      on:channel={() => closeThreadInSidebarChannel(widget, tab)}
+      on:close
+    />
   </div>
 {/if}
 
diff --git a/plugins/chunter-resources/src/components/threads/ThreadContent.svelte b/plugins/chunter-resources/src/components/threads/ThreadContent.svelte
new file mode 100644
index 0000000000..cb11b0bab6
--- /dev/null
+++ b/plugins/chunter-resources/src/components/threads/ThreadContent.svelte
@@ -0,0 +1,79 @@
+<script lang="ts">
+  import activity, { ActivityMessage } from '@hcengineering/activity'
+  import ThreadParentMessage from './ThreadParentPresenter.svelte'
+  import { Label } from '@hcengineering/ui'
+  import ChannelScrollView from '../ChannelScrollView.svelte'
+  import { Ref } from '@hcengineering/core'
+  import { ChannelDataProvider } from '../../channelDataProvider'
+  import chunter from '../../plugin'
+
+  export let selectedMessageId: Ref<ActivityMessage> | undefined = undefined
+  export let message: ActivityMessage
+
+  let dataProvider: ChannelDataProvider | undefined = undefined
+
+  $: if (message !== undefined && dataProvider === undefined) {
+    dataProvider = new ChannelDataProvider(
+      undefined,
+      message.space,
+      message._id,
+      chunter.class.ThreadMessage,
+      selectedMessageId,
+      true
+    )
+  }
+
+  $: messagesStore = dataProvider?.messagesStore
+</script>
+
+<div class="hulyComponent-content hulyComponent-content__container noShrink">
+  {#if dataProvider !== undefined}
+    <ChannelScrollView
+      bind:selectedMessageId
+      embedded
+      skipLabels
+      object={message}
+      provider={dataProvider}
+      fullHeight={false}
+      fixedInput={false}
+    >
+      <svelte:fragment slot="header">
+        <div class="mt-3">
+          <ThreadParentMessage {message} />
+        </div>
+
+        {#if (message.replies ?? $messagesStore?.length ?? 0) > 0}
+          <div class="separator">
+            <div class="label lower">
+              <Label
+                label={activity.string.RepliesCount}
+                params={{ replies: message.replies ?? $messagesStore?.length ?? 1 }}
+              />
+            </div>
+            <div class="line" />
+          </div>
+        {/if}
+      </svelte:fragment>
+    </ChannelScrollView>
+  {/if}
+</div>
+
+<style lang="scss">
+  .separator {
+    display: flex;
+    align-items: center;
+    margin: 0.5rem 0;
+
+    .label {
+      white-space: nowrap;
+      margin: 0 0.5rem;
+      color: var(--theme-halfcontent-color);
+    }
+
+    .line {
+      background: var(--theme-refinput-border);
+      height: 1px;
+      width: 100%;
+    }
+  }
+</style>
diff --git a/plugins/chunter-resources/src/components/threads/ThreadView.svelte b/plugins/chunter-resources/src/components/threads/ThreadView.svelte
index 9a249b28de..f6c386e228 100644
--- a/plugins/chunter-resources/src/components/threads/ThreadView.svelte
+++ b/plugins/chunter-resources/src/components/threads/ThreadView.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { Doc, Ref } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
-  import { Breadcrumbs, Label, location as locationStore, Header, BreadcrumbItem } from '@hcengineering/ui'
+  import { Breadcrumbs, location as locationStore, Header, BreadcrumbItem, Loading } from '@hcengineering/ui'
   import { createEventDispatcher, onDestroy } from 'svelte'
   import activity, { ActivityMessage, DisplayActivityMessage } from '@hcengineering/activity'
   import { getMessageFromLoc, messageInFocus } from '@hcengineering/activity-resources'
@@ -23,14 +23,14 @@
   import attachment from '@hcengineering/attachment'
 
   import chunter from '../../plugin'
-  import ThreadParentMessage from './ThreadParentPresenter.svelte'
   import { getObjectIcon, getChannelName } from '../../utils'
-  import ChannelScrollView from '../ChannelScrollView.svelte'
-  import { ChannelDataProvider } from '../../channelDataProvider'
+  import { threadMessagesStore } from '../../stores'
+  import ThreadContent from './ThreadContent.svelte'
 
   export let _id: Ref<ActivityMessage>
   export let selectedMessageId: Ref<ActivityMessage> | undefined = undefined
   export let showHeader: boolean = true
+  export let syncLocation = true
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
@@ -40,12 +40,12 @@
   const channelQuery = createQuery()
 
   let channel: Doc | undefined = undefined
-  let message: DisplayActivityMessage | undefined = undefined
-
+  let message: DisplayActivityMessage | undefined = $threadMessagesStore?._id === _id ? $threadMessagesStore : undefined
+  let isLoading = true
   let channelName: string | undefined = undefined
-  let dataProvider: ChannelDataProvider | undefined = undefined
 
   const unsubscribe = messageInFocus.subscribe((id) => {
+    if (!syncLocation) return
     if (id !== undefined && id !== selectedMessageId) {
       selectedMessageId = id
     }
@@ -54,6 +54,7 @@
   })
 
   const unsubscribeLocation = locationStore.subscribe((newLocation) => {
+    if (!syncLocation) return
     const id = getMessageFromLoc(newLocation)
     selectedMessageId = id
     messageInFocus.set(id)
@@ -64,12 +65,17 @@
     unsubscribeLocation()
   })
 
+  $: if (message && message._id !== _id) {
+    message = $threadMessagesStore?._id === _id ? $threadMessagesStore : undefined
+    isLoading = message === undefined
+  }
+
   $: messageQuery.query(
     activity.class.ActivityMessage,
     { _id },
     (result: ActivityMessage[]) => {
       message = result[0] as DisplayActivityMessage
-
+      isLoading = false
       if (message === undefined) {
         dispatch('close')
       }
@@ -88,42 +94,26 @@
       channel = res[0]
     })
 
-  $: if (message !== undefined && dataProvider === undefined) {
-    dataProvider = new ChannelDataProvider(
-      undefined,
-      message.space,
-      message._id,
-      chunter.class.ThreadMessage,
-      selectedMessageId,
-      true
-    )
-  }
-
   $: message &&
     getChannelName(message.attachedTo, message.attachedToClass, channel).then((res) => {
       channelName = res
     })
 
   let breadcrumbs: BreadcrumbItem[] = []
-  $: breadcrumbs = showHeader ? getBreadcrumbsItems(channel, message, channelName) : []
+  $: breadcrumbs = showHeader ? getBreadcrumbsItems(channel, channelName) : []
 
-  function getBreadcrumbsItems (
-    channel?: Doc,
-    message?: DisplayActivityMessage,
-    channelName?: string
-  ): BreadcrumbItem[] {
-    if (message === undefined) {
+  function getBreadcrumbsItems (channel?: Doc, channelName?: string): BreadcrumbItem[] {
+    if (channel === undefined) {
       return []
     }
 
     const isPersonAvatar =
-      message.attachedToClass === chunter.class.DirectMessage ||
-      hierarchy.isDerived(message.attachedToClass, contact.class.Person)
+      channel._class === chunter.class.DirectMessage || hierarchy.isDerived(channel._class, contact.class.Person)
 
     return [
       {
         id: 'channel',
-        icon: getObjectIcon(message.attachedToClass),
+        icon: getObjectIcon(channel._class),
         iconProps: { value: channel },
         iconWidth: isPersonAvatar ? 'auto' : undefined,
         withoutIconBackground: isPersonAvatar,
@@ -143,8 +133,6 @@
 
     dispatch('channel')
   }
-
-  $: messagesStore = dataProvider?.messagesStore
 </script>
 
 {#if showHeader}
@@ -153,54 +141,10 @@
   </Header>
 {/if}
 
-<div class="hulyComponent-content hulyComponent-content__container noShrink">
-  {#if message && dataProvider !== undefined}
-    <ChannelScrollView
-      bind:selectedMessageId
-      embedded
-      skipLabels
-      object={message}
-      provider={dataProvider}
-      fullHeight={false}
-      fixedInput={false}
-    >
-      <svelte:fragment slot="header">
-        <div class="mt-3">
-          <ThreadParentMessage {message} />
-        </div>
-
-        {#if (message.replies ?? $messagesStore?.length ?? 0) > 0}
-          <div class="separator">
-            <div class="label lower">
-              <Label
-                label={activity.string.RepliesCount}
-                params={{ replies: message.replies ?? $messagesStore?.length ?? 1 }}
-              />
-            </div>
-            <div class="line" />
-          </div>
-        {/if}
-      </svelte:fragment>
-    </ChannelScrollView>
-  {/if}
-</div>
-
-<style lang="scss">
-  .separator {
-    display: flex;
-    align-items: center;
-    margin: 0.5rem 0;
-
-    .label {
-      white-space: nowrap;
-      margin: 0 0.5rem;
-      color: var(--theme-halfcontent-color);
-    }
-
-    .line {
-      background: var(--theme-refinput-border);
-      height: 1px;
-      width: 100%;
-    }
-  }
-</style>
+{#if message}
+  {#key _id}
+    <ThreadContent bind:selectedMessageId {message} />
+  {/key}
+{:else if isLoading}
+  <Loading />
+{/if}
diff --git a/plugins/chunter-resources/src/navigation.ts b/plugins/chunter-resources/src/navigation.ts
index 6e9cf29e75..9281c98fa2 100644
--- a/plugins/chunter-resources/src/navigation.ts
+++ b/plugins/chunter-resources/src/navigation.ts
@@ -28,6 +28,7 @@ import { get } from 'svelte/store'
 import { chatSpecials } from './components/chat/utils'
 import { getChannelName, isThreadMessage } from './utils'
 import chunter from './plugin'
+import { threadMessagesStore } from './stores'
 
 export function openChannel (_id: string, _class: Ref<Class<Doc>>, thread?: Ref<ActivityMessage>): void {
   const loc = getCurrentLocation()
@@ -168,6 +169,8 @@ export async function replyToThread (message: ActivityMessage, e: Event): Promis
   const fromSidebar = isElementFromSidebar(e.target as HTMLElement)
   const loc = getCurrentLocation()
 
+  threadMessagesStore.set(message)
+
   if (fromSidebar) {
     const widget = getClient().getModel().findAllSync(workbench.class.Widget, { _id: chunter.ids.ChatWidget })[0]
     const widgetState = get(sidebarStore).widgetsState.get(widget._id)
@@ -235,7 +238,8 @@ export async function openChannelInSidebar (
   _class: Ref<Class<Doc>>,
   doc?: Doc,
   thread?: Ref<ActivityMessage>,
-  newTab = true
+  newTab = true,
+  selectedMessageId?: Ref<ActivityMessage>
 ): Promise<void> {
   const client = getClient()
 
@@ -267,6 +271,7 @@ export async function openChannelInSidebar (
       _id,
       _class,
       thread,
+      selectedMessageId,
       channelName: name
     }
   }
diff --git a/plugins/chunter-resources/src/stores.ts b/plugins/chunter-resources/src/stores.ts
index 789c8a702d..03b1b787ad 100644
--- a/plugins/chunter-resources/src/stores.ts
+++ b/plugins/chunter-resources/src/stores.ts
@@ -17,11 +17,14 @@ import { writable } from 'svelte/store'
 import { type ChatMessage } from '@hcengineering/chunter'
 import { type Markup, type Ref } from '@hcengineering/core'
 import { languageStore } from '@hcengineering/ui'
+import { type ActivityMessage } from '@hcengineering/activity'
 
 export const translatingMessagesStore = writable<Set<Ref<ChatMessage>>>(new Set())
 export const translatedMessagesStore = writable<Map<Ref<ChatMessage>, Markup>>(new Map())
 export const shownTranslatedMessagesStore = writable<Set<Ref<ChatMessage>>>(new Set())
 
+export const threadMessagesStore = writable<ActivityMessage | undefined>(undefined)
+
 languageStore.subscribe(() => {
   translatedMessagesStore.set(new Map())
   shownTranslatedMessagesStore.set(new Set())
diff --git a/plugins/chunter/src/index.ts b/plugins/chunter/src/index.ts
index 3c814160b9..662ea1e23d 100644
--- a/plugins/chunter/src/index.ts
+++ b/plugins/chunter/src/index.ts
@@ -100,7 +100,13 @@ export interface InlineButton extends AttachedDoc {
 }
 
 export interface ChatWidgetTab extends WidgetTab {
-  data: { _id?: Ref<Doc>, _class?: Ref<Class<Doc>>, thread?: Ref<ActivityMessage>, channelName: string }
+  data: {
+    _id?: Ref<Doc>
+    _class?: Ref<Class<Doc>>
+    thread?: Ref<ActivityMessage>
+    channelName: string
+    selectedMessageId?: Ref<ActivityMessage>
+  }
 }
 
 /**
@@ -234,7 +240,14 @@ export default plugin(chunterId, {
     CanTranslateMessage: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
     OpenThreadInSidebar: '' as Resource<(_id: Ref<ActivityMessage>, msg?: ActivityMessage, doc?: Doc) => Promise<void>>,
     OpenChannelInSidebar: '' as Resource<
-    (_id: Ref<Doc>, _class: Ref<Doc>, doc?: Doc, thread?: Ref<ActivityMessage>) => Promise<void>
+    (
+      _id: Ref<Doc>,
+      _class: Ref<Class<Doc>>,
+      doc?: Doc,
+      thread?: Ref<ActivityMessage>,
+      newTab?: boolean,
+      selectedMessageId?: Ref<ActivityMessage>
+    ) => Promise<void>
     >
   }
 })
diff --git a/plugins/notification-resources/src/components/DocNotifyContextCard.svelte b/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
index d9c8b7ef75..206e845674 100644
--- a/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
+++ b/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
@@ -64,6 +64,7 @@
 
   $: if (object !== undefined && object?._id !== value.objectId) {
     object = undefined
+    isLoading = true
   }
 
   let isActionMenuOpened = false
diff --git a/plugins/notification-resources/src/components/Notification.svelte b/plugins/notification-resources/src/components/Notification.svelte
index e76f6c5ae8..0fd5045cee 100644
--- a/plugins/notification-resources/src/components/Notification.svelte
+++ b/plugins/notification-resources/src/components/Notification.svelte
@@ -1,13 +1,14 @@
 <script lang="ts">
   import { PersonAccount } from '@hcengineering/contact'
   import { Avatar, personAccountByIdStore, personByIdStore } from '@hcengineering/contact-resources'
-  import { Ref } from '@hcengineering/core'
+  import { Class, Doc, Ref } from '@hcengineering/core'
   import { BrowserNotification } from '@hcengineering/notification'
   import { Button, navigate, Notification as PlatformNotification, NotificationToast } from '@hcengineering/ui'
-  import view, { decodeObjectURI } from '@hcengineering/view'
-  import chunter from '@hcengineering/chunter'
+  import view from '@hcengineering/view'
+  import chunter, { ThreadMessage } from '@hcengineering/chunter'
   import { getResource } from '@hcengineering/platform'
-  import { ActivityMessage } from '@hcengineering/activity'
+  import activity, { ActivityMessage } from '@hcengineering/activity'
+  import { getClient } from '@hcengineering/presentation'
 
   import { pushAvailable, subscribePush } from '../utils'
   import plugin from '../plugin'
@@ -15,6 +16,9 @@
   export let notification: PlatformNotification
   export let onRemove: () => void
 
+  const client = getClient()
+  const hierarchy = client.getHierarchy()
+
   $: value = notification.params?.value as BrowserNotification
 
   $: senderAccount =
@@ -24,18 +28,35 @@
   async function openChannelInSidebar (): Promise<void> {
     if (!value.onClickLocation) return
     const { onClickLocation } = value
-    const [_id, _class] = decodeObjectURI(onClickLocation.path[3] ?? '')
+    let _id: Ref<Doc> | undefined = value.objectId
+    let _class: Ref<Class<Doc>> | undefined = value.objectClass
+    let thread = onClickLocation.path[4] as Ref<ActivityMessage> | undefined
+    const selectedMessageId: Ref<ActivityMessage> | undefined = value.messageId
+
+    if (_class && _id && hierarchy.isDerived(_class, activity.class.ActivityMessage)) {
+      const message = await client.findOne<ActivityMessage>(_class, { _id: _id as Ref<ActivityMessage> })
+
+      if (hierarchy.isDerived(_class, chunter.class.ThreadMessage)) {
+        const threadMessage = message as ThreadMessage
+        _id = threadMessage?.objectId
+        _class = threadMessage?.objectClass
+        thread = threadMessage?.attachedTo
+      } else {
+        _id = message?.attachedTo
+        _class = message?.attachedToClass
+        thread = (message?.replies ?? 0) > 0 ? message?._id : undefined
+      }
+    }
 
     onRemove()
 
-    if (!_id || !_class || _id === '' || _class === '') {
+    if (!_id || !_class || _id === '' || _class === '' || selectedMessageId === undefined) {
       navigate(onClickLocation)
       return
     }
 
-    const thread = onClickLocation.path[4] as Ref<ActivityMessage> | undefined
     const fn = await getResource(chunter.function.OpenChannelInSidebar)
-    await fn(_id, _class, undefined, thread)
+    await fn(_id, _class, undefined, thread, true, selectedMessageId)
   }
 </script>
 
@@ -56,7 +77,7 @@
       <Button
         label={view.string.Open}
         on:click={() => {
-          openChannelInSidebar()
+          void openChannelInSidebar()
         }}
       />
     {/if}
diff --git a/plugins/notification/src/index.ts b/plugins/notification/src/index.ts
index 75febb84e5..c7ff56340d 100644
--- a/plugins/notification/src/index.ts
+++ b/plugins/notification/src/index.ts
@@ -53,6 +53,10 @@ export interface BrowserNotification extends Doc {
   onClickLocation?: Location
   senderId?: Ref<Account>
   tag: Ref<Doc>
+  messageId?: Ref<ActivityMessage>
+  messageClass?: Ref<Class<ActivityMessage>>
+  objectId: Ref<Doc>
+  objectClass: Ref<Class<Doc>>
 }
 
 export interface PushData {
diff --git a/plugins/time/src/index.ts b/plugins/time/src/index.ts
index 7e3d6d6982..49b695a6e4 100644
--- a/plugins/time/src/index.ts
+++ b/plugins/time/src/index.ts
@@ -160,6 +160,7 @@ export default plugin(timeId, {
     CreatedToDo: '' as IntlString,
     AddToDo: '' as IntlString,
     NewToDoDetails: '' as IntlString,
-    ToDo: '' as IntlString
+    ToDo: '' as IntlString,
+    NewToDo: '' as IntlString
   }
 })
diff --git a/plugins/workbench-resources/src/sidebar.ts b/plugins/workbench-resources/src/sidebar.ts
index ee1ff76cdd..8be7c826bf 100644
--- a/plugins/workbench-resources/src/sidebar.ts
+++ b/plugins/workbench-resources/src/sidebar.ts
@@ -316,3 +316,20 @@ export function minimizeSidebar (closedByUser = false): void {
 
   sidebarStore.set({ ...state, ...widgetsState, widget: undefined, variant: SidebarVariant.MINI })
 }
+
+export function updateTabData (widget: Ref<Widget>, tabId: string, data: Record<string, any>): void {
+  const state = get(sidebarStore)
+  const { widgetsState } = state
+  const widgetState = widgetsState.get(widget)
+
+  if (widgetState === undefined) return
+
+  const tabs = widgetState.tabs.map((it) => (it.id === tabId ? { ...it, data: { ...it.data, ...data } } : it))
+
+  widgetsState.set(widget, { ...widgetState, tabs })
+
+  sidebarStore.set({
+    ...state,
+    widgetsState
+  })
+}
diff --git a/server-plugins/notification-resources/src/index.ts b/server-plugins/notification-resources/src/index.ts
index a09e410c19..6df2fc5a7f 100644
--- a/server-plugins/notification-resources/src/index.ts
+++ b/server-plugins/notification-resources/src/index.ts
@@ -175,7 +175,8 @@ export async function getCommonNotificationTxes (
       doc,
       receiver,
       sender,
-      subscriptions
+      subscriptions,
+      _class
     )
   }
 
@@ -487,6 +488,14 @@ export async function getTranslatedNotificationContent (
   return { title: '', body: '' }
 }
 
+function isReactionMessage (message?: ActivityMessage): boolean {
+  return (
+    message !== undefined &&
+    message._class === activity.class.DocUpdateMessage &&
+    (message as DocUpdateMessage).objectClass === activity.class.Reaction
+  )
+}
+
 export async function createPushFromInbox (
   control: TriggerControl,
   receiver: ReceiverInfo,
@@ -497,10 +506,9 @@ export async function createPushFromInbox (
   sender: SenderInfo,
   _id: Ref<Doc>,
   subscriptions: PushSubscription[],
-  cache: Map<Ref<Doc>, Doc> = new Map<Ref<Doc>, Doc>()
+  message?: ActivityMessage
 ): Promise<Tx | undefined> {
   let { title, body } = await getTranslatedNotificationContent(data, _class, control)
-
   if (title === '' || body === '') {
     return
   }
@@ -515,13 +523,12 @@ export async function createPushFromInbox (
 
   if (provider !== undefined) {
     const encodeFn = await getResource(provider.encode)
-    const doc = cache.get(attachedTo) ?? (await control.findAll(control.ctx, attachedToClass, { _id: attachedTo }))[0]
+    const doc = (await control.findAll(control.ctx, attachedToClass, { _id: attachedTo }))[0]
 
     if (doc === undefined) {
       return
     }
 
-    cache.set(doc._id, doc)
     id = await encodeFn(doc, control)
   }
 
@@ -543,6 +550,12 @@ export async function createPushFromInbox (
     body,
     senderId: sender._id,
     tag: _id,
+    objectId: attachedTo,
+    objectClass: attachedToClass,
+    messageId: isReactionMessage(message) ? (message?.attachedTo as Ref<ActivityMessage>) : message?._id,
+    messageClass: isReactionMessage(message)
+      ? (message?.attachedToClass as Ref<Class<ActivityMessage>>)
+      : message?._class,
     onClickLocation: {
       path
     }
@@ -664,6 +677,7 @@ export async function applyNotificationProviders (
   receiver: ReceiverInfo,
   sender: SenderInfo,
   subscriptions: PushSubscription[],
+  _class = notification.class.ActivityInboxNotification,
   message?: ActivityMessage
 ): Promise<void> {
   const resources = control.modelDb.findAllSync(serverNotification.class.NotificationProviderResources, {})
@@ -676,10 +690,11 @@ export async function applyNotificationProviders (
         attachedTo,
         attachedToClass,
         data,
-        notification.class.ActivityInboxNotification,
+        _class,
         sender,
         data._id,
-        subscriptions
+        subscriptions,
+        message
       )
       if (pushTx !== undefined) {
         res.push(pushTx)
@@ -796,6 +811,7 @@ export async function getNotificationTxes (
           receiver,
           sender,
           subscriptions,
+          notificationData._class,
           message
         )
       }
diff --git a/server/server-pipeline/package.json b/server/server-pipeline/package.json
index cd25ceba1e..4614875dfd 100644
--- a/server/server-pipeline/package.json
+++ b/server/server-pipeline/package.json
@@ -172,6 +172,8 @@
     "@hcengineering/github": "^0.6.0",
     "@hcengineering/github-assets": "^0.6.0",
     "@hcengineering/server-ai-bot": "^0.6.0",
-    "@hcengineering/server-ai-bot-resources": "^0.6.0"
+    "@hcengineering/server-ai-bot-resources": "^0.6.0",
+    "@hcengineering/time": "^0.6.0",
+    "@hcengineering/time-assets": "^0.6.0"
   }
 }
diff --git a/server/server-pipeline/src/internationalization.ts b/server/server-pipeline/src/internationalization.ts
index 0a19bc82ed..f0b448a8f6 100644
--- a/server/server-pipeline/src/internationalization.ts
+++ b/server/server-pipeline/src/internationalization.ts
@@ -33,6 +33,7 @@ import { trackerId } from '@hcengineering/tracker'
 import { trainingId } from '@hcengineering/training'
 import { viewId } from '@hcengineering/view'
 import { workbenchId } from '@hcengineering/workbench'
+import { timeId } from '@hcengineering/time'
 import coreEng from '@hcengineering/core/lang/en.json'
 import loginEng from '@hcengineering/login-assets/lang/en.json'
 import platformEng from '@hcengineering/platform/lang/en.json'
@@ -68,6 +69,7 @@ import trackerEn from '@hcengineering/tracker-assets/lang/en.json'
 import trainingEn from '@hcengineering/training-assets/lang/en.json'
 import viewEn from '@hcengineering/view-assets/lang/en.json'
 import workbenchEn from '@hcengineering/workbench-assets/lang/en.json'
+import timeEn from '@hcengineering/time-assets/lang/en.json'
 
 export function registerStringLoaders (): void {
   addStringsLoader(coreId, async (lang: string) => coreEng)
@@ -106,4 +108,5 @@ export function registerStringLoaders (): void {
   addStringsLoader(productsId, async (lang: string) => productsEn)
   addStringsLoader(trainingId, async (lang: string) => trainingEn)
   addStringsLoader(githubId, async (lang: string) => githubEn)
+  addStringsLoader(timeId, async (lang: string) => timeEn)
 }