From bc9d3e396d937690de82fa02e2e53cde672f71bb Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Fri, 2 Feb 2024 15:34:13 +0400
Subject: [PATCH] UBERF-5232: fix wrong activity message title (#4498)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 .../DocUpdateMessageContent.svelte            | 14 +++--------
 .../DocUpdateMessagePresenter.svelte          | 23 +++++++++++++------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessageContent.svelte b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessageContent.svelte
index 9646b93f38..810371cb0e 100644
--- a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessageContent.svelte
+++ b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessageContent.svelte
@@ -13,11 +13,8 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { AttachedDoc, Attribute, Class, Collection, Doc, Ref } from '@hcengineering/core'
   import { Icon, Label } from '@hcengineering/ui'
-  import { IntlString } from '@hcengineering/platform'
-  import { getClient } from '@hcengineering/presentation'
-  import view from '@hcengineering/view'
+  import { Asset, IntlString } from '@hcengineering/platform'
   import activity, { DisplayDocUpdateMessage, DocUpdateMessage, DocUpdateMessageViewlet } from '@hcengineering/activity'
 
   import DocUpdateMessageObjectValue from './DocUpdateMessageObjectValue.svelte'
@@ -26,11 +23,7 @@
   export let viewlet: DocUpdateMessageViewlet | undefined
   export let objectName: IntlString | undefined
   export let collectionName: IntlString | undefined
-  export let collectionAttribute: Attribute<Collection<AttachedDoc>> | undefined = undefined
-
-  const client = getClient()
-  const hierarchy = client.getHierarchy()
-  const clazz = hierarchy.getClass(message.objectClass)
+  export let objectIcon: Asset | undefined
 
   const isOwn = message.objectId === message.attachedTo
 
@@ -38,12 +31,11 @@
 
   $: valueMessages = message.previousMessages?.length ? [...message.previousMessages, message] : [message]
   $: hasDifferentActions = message.previousMessages?.some(({ action }) => action !== message.action)
-  $: icon = viewlet?.icon ?? collectionAttribute?.icon ?? clazz.icon ?? activity.icon.Activity
 </script>
 
 <div class="content">
   <span class="mr-1">
-    <Icon {icon} size="small" />
+    <Icon icon={viewlet?.icon ?? objectIcon ?? activity.icon.Activity} size="small" />
   </span>
   {#if hasDifferentActions}
     <Label label={activity.string.UpdatedCollection} />
diff --git a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
index f3f6de6b8b..98377461cb 100644
--- a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
@@ -27,6 +27,7 @@
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { Component, ShowMore, Action } from '@hcengineering/ui'
   import { AttributeModel } from '@hcengineering/view'
+  import { buildRemovedDoc, checkIsObjectRemoved } from '@hcengineering/view-resources'
 
   import ActivityMessageTemplate from '../activity-message/ActivityMessageTemplate.svelte'
   import DocUpdateMessageAttributes from './DocUpdateMessageAttributes.svelte'
@@ -34,7 +35,6 @@
   import DocUpdateMessageHeader from './DocUpdateMessageHeader.svelte'
 
   import { getAttributeModel, getCollectionAttribute } from '../../activityMessagesUtils'
-  import { buildRemovedDoc, checkIsObjectRemoved } from '@hcengineering/view-resources'
 
   export let value: DisplayDocUpdateMessage
   export let showNotify: boolean = false
@@ -60,11 +60,14 @@
   const objectQuery = createQuery()
   const parentObjectQuery = createQuery()
 
-  const collectionAttribute = getCollectionAttribute(hierarchy, value.attachedToClass, value.updateCollection)
-  const clazz = hierarchy.getClass(value.objectClass)
-  const objectName: IntlString | undefined =
-    (collectionAttribute?.type as Collection<AttachedDoc>)?.itemLabel || clazz.label
-  const collectionName = collectionAttribute?.label
+  let objectName: IntlString | undefined = undefined
+  let collectionName: IntlString | undefined = undefined
+
+  $: collectionAttribute = getCollectionAttribute(hierarchy, value.attachedToClass, value.updateCollection)
+  $: clazz = hierarchy.getClass(value.objectClass)
+
+  $: objectName = (collectionAttribute?.type as Collection<AttachedDoc>)?.itemLabel || clazz.label
+  $: collectionName = collectionAttribute?.label
 
   let user: PersonAccount | undefined = undefined
   let person: Person | undefined = undefined
@@ -190,7 +193,13 @@
       </ShowMore>
     {:else if value.action === 'create' || value.action === 'remove'}
       <ShowMore>
-        <DocUpdateMessageContent message={value} {viewlet} {objectName} {collectionName} {collectionAttribute} />
+        <DocUpdateMessageContent
+          message={value}
+          {viewlet}
+          {objectName}
+          {collectionName}
+          objectIcon={collectionAttribute?.icon ?? clazz.icon}
+        />
       </ShowMore>
     {:else if value.attributeUpdates && attributeModel}
       <DocUpdateMessageAttributes attributeUpdates={value.attributeUpdates} {attributeModel} {viewlet} />