From 99749f30fb70099dfdeee9e427ab0b9c96f1818e Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Wed, 2 Oct 2024 11:00:17 +0400
Subject: [PATCH] Add chat and inbox fixes (#6779)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 .../components/ActivityMessageAction.svelte   |  2 +-
 plugins/chunter-assets/lang/ru.json           |  2 +-
 .../src/components/ChannelScrollView.svelte   |  2 +-
 plugins/chunter-resources/src/navigation.ts   |  2 +-
 .../src/components/inbox/Inbox.svelte         | 43 +++++++++++++++----
 plugins/notification-resources/src/utils.ts   |  8 +++-
 6 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/plugins/activity-resources/src/components/ActivityMessageAction.svelte b/plugins/activity-resources/src/components/ActivityMessageAction.svelte
index 5ca696292a..b8bcfae1fd 100644
--- a/plugins/activity-resources/src/components/ActivityMessageAction.svelte
+++ b/plugins/activity-resources/src/components/ActivityMessageAction.svelte
@@ -40,6 +40,6 @@
   kind="tertiary"
   pressed={opened}
   {dataId}
-  tooltip={{ label }}
+  tooltip={{ label, direction: 'bottom' }}
   on:click={onClick}
 />
diff --git a/plugins/chunter-assets/lang/ru.json b/plugins/chunter-assets/lang/ru.json
index efdecade4d..5a0e3d671c 100644
--- a/plugins/chunter-assets/lang/ru.json
+++ b/plugins/chunter-assets/lang/ru.json
@@ -81,7 +81,7 @@
     "Reacted": "Отреагировал(а)",
     "Docs": "Documents",
     "NewestFirst": "Сначала новые",
-    "ReplyToThread": "Ответить в канале",
+    "ReplyToThread": "Ответить в теме",
     "SentMessage": "Отправил(а) сообщение",
     "Direct": "Личные сообщения",
     "RepliedToThread": "Ответил(а) в канале",
diff --git a/plugins/chunter-resources/src/components/ChannelScrollView.svelte b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
index 0544d9356d..7d94424e32 100644
--- a/plugins/chunter-resources/src/components/ChannelScrollView.svelte
+++ b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
@@ -379,7 +379,7 @@
   function messageInView (msgElement: Element, containerRect: DOMRect): boolean {
     const messageRect = msgElement.getBoundingClientRect()
 
-    return messageRect.top >= containerRect.top && messageRect.bottom - messageRect.height / 2 <= containerRect.bottom
+    return messageRect.top >= containerRect.top && messageRect.top <= containerRect.bottom && messageRect.bottom >= 0
   }
 
   const messagesToReadAccumulator: Set<DisplayActivityMessage> = new Set<DisplayActivityMessage>()
diff --git a/plugins/chunter-resources/src/navigation.ts b/plugins/chunter-resources/src/navigation.ts
index 95d3b97eea..48111482d4 100644
--- a/plugins/chunter-resources/src/navigation.ts
+++ b/plugins/chunter-resources/src/navigation.ts
@@ -151,7 +151,7 @@ export async function buildThreadLink (
     loc.path[2] = chunterId
   }
 
-  loc.query = { message: '' }
+  loc.query = { ...loc.query, message: '' }
   loc.path[3] = objectURI
   loc.path[4] = threadParent
   loc.fragment = undefined
diff --git a/plugins/notification-resources/src/components/inbox/Inbox.svelte b/plugins/notification-resources/src/components/inbox/Inbox.svelte
index f66650eb87..8f751f3e42 100644
--- a/plugins/notification-resources/src/components/inbox/Inbox.svelte
+++ b/plugins/notification-resources/src/components/inbox/Inbox.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import activity, { ActivityMessage } from '@hcengineering/activity'
   import chunter from '@hcengineering/chunter'
-  import { getCurrentAccount, groupByArray, IdMap, Ref, SortingOrder } from '@hcengineering/core'
+  import { Class, Doc, getCurrentAccount, groupByArray, IdMap, Ref, SortingOrder } from '@hcengineering/core'
   import { DocNotifyContext, InboxNotification, notificationId } from '@hcengineering/notification'
   import { ActionContext, createQuery, getClient } from '@hcengineering/presentation'
   import {
@@ -68,6 +68,9 @@
 
   const linkProviders = client.getModel().findAllSync(view.mixin.LinkIdProvider, {})
 
+  let urlObjectId: Ref<Doc> | undefined = undefined
+  let urlObjectClass: Ref<Class<Doc>> | undefined = undefined
+
   let showArchive = false
   let archivedActivityNotifications: InboxNotification[] = []
   let archivedOtherNotifications: InboxNotification[] = []
@@ -165,14 +168,19 @@
 
     if (loc?.loc.path[3] == null) {
       selectedContext = undefined
+      urlObjectId = undefined
+      urlObjectClass = undefined
       restoreLocation(newLocation, notificationId)
       return
     }
 
     const [id, _class] = decodeObjectURI(loc?.loc.path[3] ?? '')
     const _id = await parseLinkId(linkProviders, id, _class)
+    urlObjectId = _id
+    urlObjectClass = _class
     const thread = loc?.loc.path[4] as Ref<ActivityMessage>
-    const context = $contextByDocStore.get(thread) ?? $contextByDocStore.get(_id)
+    const queryContext = loc.loc.query?.context as Ref<DocNotifyContext>
+    const context = $contextByIdStore.get(queryContext) ?? $contextByDocStore.get(thread) ?? $contextByDocStore.get(_id)
 
     selectedContextId = context?._id
 
@@ -199,7 +207,7 @@
 
   $: selectedContext = selectedContextId ? selectedContext ?? $contextByIdStore.get(selectedContextId) : undefined
 
-  $: void updateSelectedPanel(selectedContext)
+  $: void updateSelectedPanel(selectedContext, urlObjectClass)
   $: void updateTabItems(inboxData, $contextsStore)
 
   async function updateTabItems (inboxData: InboxData, notifyContexts: DocNotifyContext[]): Promise<void> {
@@ -258,15 +266,28 @@
 
     void selectInboxContext(linkProviders, selectedContext, selectedNotification, event?.detail.object)
   }
+  function isChunterChannel (selectedContext: DocNotifyContext, urlObjectClass?: Ref<Class<Doc>>): boolean {
+    const isActivityMessageContext = hierarchy.isDerived(selectedContext.objectClass, activity.class.ActivityMessage)
+    const chunterClass = isActivityMessageContext
+      ? urlObjectClass ?? selectedContext.objectClass
+      : selectedContext.objectClass
+    return hierarchy.isDerived(chunterClass, chunter.class.ChunterSpace)
+  }
 
-  async function updateSelectedPanel (selectedContext?: DocNotifyContext): Promise<void> {
+  async function updateSelectedPanel (
+    selectedContext?: DocNotifyContext,
+    urlObjectClass?: Ref<Class<Doc>>
+  ): Promise<void> {
     if (selectedContext === undefined) {
       selectedComponent = undefined
       return
     }
 
-    const isChunterChannel = hierarchy.isDerived(selectedContext.objectClass, chunter.class.ChunterSpace)
-    const panelComponent = hierarchy.classHierarchyMixin(selectedContext.objectClass, view.mixin.ObjectPanel)
+    const isChunter = isChunterChannel(selectedContext, urlObjectClass)
+    const panelComponent = hierarchy.classHierarchyMixin(
+      isChunter ? urlObjectClass ?? selectedContext.objectClass : selectedContext.objectClass,
+      view.mixin.ObjectPanel
+    )
 
     selectedComponent = panelComponent?.component ?? view.component.EditDoc
 
@@ -278,7 +299,7 @@
         ops,
         contextNotifications
           .filter(({ _class, isViewed }) =>
-            isChunterChannel ? _class === notification.class.CommonInboxNotification : !isViewed
+            isChunter ? _class === notification.class.CommonInboxNotification : !isViewed
           )
           .map(({ _id }) => _id)
       )
@@ -432,8 +453,12 @@
       <Component
         is={selectedComponent}
         props={{
-          _id: selectedContext.objectId,
-          _class: selectedContext.objectClass,
+          _id: isChunterChannel(selectedContext, urlObjectClass)
+            ? urlObjectId ?? selectedContext.objectId
+            : selectedContext.objectId,
+          _class: isChunterChannel(selectedContext, urlObjectClass)
+            ? urlObjectClass ?? selectedContext.objectClass
+            : selectedContext.objectClass,
           context: selectedContext,
           activityMessage: selectedMessage,
           props: { context: selectedContext }
diff --git a/plugins/notification-resources/src/utils.ts b/plugins/notification-resources/src/utils.ts
index b3710c8675..f5977d1d8d 100644
--- a/plugins/notification-resources/src/utils.ts
+++ b/plugins/notification-resources/src/utils.ts
@@ -531,6 +531,7 @@ async function generateLocation (
 
 async function navigateToInboxDoc (
   providers: LinkIdProvider[],
+  context: Ref<DocNotifyContext>,
   _id?: Ref<Doc>,
   _class?: Ref<Class<Doc>>,
   thread?: Ref<ActivityMessage>,
@@ -559,7 +560,7 @@ async function navigateToInboxDoc (
     loc.path.length = 4
   }
 
-  loc.query = { ...loc.query, message: message ?? null }
+  loc.query = { ...loc.query, context, message: message ?? null }
   messageInFocus.set(message)
   Analytics.handleEvent('inbox.ReadDoc', { objectId: id, objectClass: _class, thread, message })
   navigate(loc)
@@ -596,6 +597,7 @@ export async function selectInboxContext (
 
     void navigateToInboxDoc(
       linkProviders,
+      context._id,
       objectId,
       objectClass,
       isActivityMessageClass(objectClass) ? (objectId as Ref<ActivityMessage>) : undefined,
@@ -621,6 +623,7 @@ export async function selectInboxContext (
 
       void navigateToInboxDoc(
         linkProviders,
+        context._id,
         thread?.objectId ?? objectId,
         thread?.objectClass ?? objectClass,
         thread?.attachedTo,
@@ -642,6 +645,7 @@ export async function selectInboxContext (
 
       void navigateToInboxDoc(
         linkProviders,
+        context._id,
         channelId,
         channelClass,
         thread as Ref<ActivityMessage>,
@@ -657,6 +661,7 @@ export async function selectInboxContext (
 
     void navigateToInboxDoc(
       linkProviders,
+      context._id,
       channelId,
       channelClass,
       thread as Ref<ActivityMessage>,
@@ -667,6 +672,7 @@ export async function selectInboxContext (
 
   void navigateToInboxDoc(
     linkProviders,
+    context._id,
     objectId,
     objectClass,
     undefined,