From 80a14b3f08c2905fd615a6ef68dfe302dc2d558f Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Tue, 29 Apr 2025 11:48:17 +0400
Subject: [PATCH] Fix activity for removed tags (#8761)

* Fix activity for removed tags

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>

* Fix text

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>

---------

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 .../message/ActivityMessageViewer.svelte      |  2 +-
 .../activity/ActivityUpdateTagViewer.svelte   | 46 ++++++++++++-------
 .../activity/ActivityUpdateViewer.svelte      |  5 +-
 plugins/activity-assets/lang/cs.json          |  4 +-
 plugins/activity-assets/lang/de.json          |  4 +-
 plugins/activity-assets/lang/en.json          |  2 +
 plugins/activity-assets/lang/es.json          |  4 +-
 plugins/activity-assets/lang/fr.json          |  4 +-
 plugins/activity-assets/lang/it.json          |  4 +-
 plugins/activity-assets/lang/ja.json          |  4 +-
 plugins/activity-assets/lang/pt.json          |  4 +-
 plugins/activity-assets/lang/ru.json          |  4 +-
 plugins/activity-assets/lang/zh.json          |  4 +-
 plugins/activity/src/index.ts                 |  4 +-
 .../activity-resources/src/newActivity.ts     |  4 +-
 15 files changed, 67 insertions(+), 32 deletions(-)

diff --git a/packages/ui-next/src/components/message/ActivityMessageViewer.svelte b/packages/ui-next/src/components/message/ActivityMessageViewer.svelte
index 760a63f09e..a28956580f 100644
--- a/packages/ui-next/src/components/message/ActivityMessageViewer.svelte
+++ b/packages/ui-next/src/components/message/ActivityMessageViewer.svelte
@@ -41,5 +41,5 @@
 {#if data.action === 'create'}
   <ActivityObjectValue {message} {card} />
 {:else if data.update && data.action === 'update'}
-  <ActivityUpdateViewer update={data.update} model={attributeModel} />
+  <ActivityUpdateViewer update={data.update} model={attributeModel} content={message.content} />
 {/if}
diff --git a/packages/ui-next/src/components/message/activity/ActivityUpdateTagViewer.svelte b/packages/ui-next/src/components/message/activity/ActivityUpdateTagViewer.svelte
index 893c947477..ec7259b087 100644
--- a/packages/ui-next/src/components/message/activity/ActivityUpdateTagViewer.svelte
+++ b/packages/ui-next/src/components/message/activity/ActivityUpdateTagViewer.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { getClient } from '@hcengineering/presentation'
   import { IconDelete } from '@hcengineering/ui'
-  import { ActivityTagUpdate } from '@hcengineering/communication-types'
+  import { ActivityTagUpdate, RichText } from '@hcengineering/communication-types'
   import cardPlugin from '@hcengineering/card'
 
   import Icon from '../../Icon.svelte'
@@ -24,30 +24,42 @@
   import uiNext from '../../../plugin'
 
   export let update: ActivityTagUpdate
+  export let content: RichText
 
   const client = getClient()
   const hierarchy = client.getHierarchy()
 
-  $: mixin = hierarchy.getClass(update.tag)
+  $: mixin = hierarchy.hasClass(update.tag) ? hierarchy.getClass(update.tag) : undefined
 </script>
 
-{#if update.action === 'add'}
-  <div class="flex-presenter overflow-label flex-gap-2">
-    <Icon icon={IconPlus} size="small" />
-    <Label label={uiNext.string.Added} />
-    <span class="lower"><Label label={cardPlugin.string.Tag} /></span>
-    <div class="tag no-word-wrap">
-      <Label label={mixin.label} />
+{#if mixin !== undefined}
+  {#if update.action === 'add'}
+    <div class="flex-presenter overflow-label flex-gap-2">
+      <Icon icon={IconPlus} size="small" />
+      <Label label={uiNext.string.Added} />
+      <span class="lower"><Label label={cardPlugin.string.Tag} /></span>
+      <div class="tag no-word-wrap">
+        <Label label={mixin.label} />
+      </div>
     </div>
-  </div>
-{:else if update.action === 'remove'}
-  <div class="flex-presenter overflow-label flex-gap-2">
-    <Icon icon={IconDelete} size="small" />
-    <Label label={uiNext.string.Removed} />
-    <span class="lower"><Label label={cardPlugin.string.Tag} /></span>
-    <div class="tag no-word-wrap">
-      <Label label={mixin.label} />
+  {:else if update.action === 'remove'}
+    <div class="flex-presenter overflow-label flex-gap-2">
+      <Icon icon={IconDelete} size="small" />
+      <Label label={uiNext.string.Removed} />
+      <span class="lower"><Label label={cardPlugin.string.Tag} /></span>
+      <div class="tag no-word-wrap">
+        <Label label={mixin.label} />
+      </div>
     </div>
+  {/if}
+{:else}
+  <div class="flex-presenter overflow-label flex-gap-2">
+    {#if update.action === 'add'}
+      <Icon icon={IconPlus} size="small" />
+    {:else if update.action === 'remove'}
+      <Icon icon={IconDelete} size="small" />
+    {/if}
+    {content}
   </div>
 {/if}
 
diff --git a/packages/ui-next/src/components/message/activity/ActivityUpdateViewer.svelte b/packages/ui-next/src/components/message/activity/ActivityUpdateViewer.svelte
index cc076beca3..e2bee07ca4 100644
--- a/packages/ui-next/src/components/message/activity/ActivityUpdateViewer.svelte
+++ b/packages/ui-next/src/components/message/activity/ActivityUpdateViewer.svelte
@@ -14,17 +14,18 @@
 -->
 <script lang="ts">
   import { AttributeModel } from '@hcengineering/view'
-  import { ActivityUpdate, ActivityUpdateType } from '@hcengineering/communication-types'
+  import { ActivityUpdate, ActivityUpdateType, RichText } from '@hcengineering/communication-types'
 
   import ActivityUpdateTagViewer from './ActivityUpdateTagViewer.svelte'
   import ActivityUpdateAttributeViewer from './ActivityUpdateAttributeViewer.svelte'
 
   export let model: AttributeModel | undefined = undefined
   export let update: ActivityUpdate
+  export let content: RichText
 </script>
 
 {#if update.type === ActivityUpdateType.Attribute && model}
   <ActivityUpdateAttributeViewer {model} {update} />
 {:else if update.type === ActivityUpdateType.Tag}
-  <ActivityUpdateTagViewer {update} />
+  <ActivityUpdateTagViewer {update} {content} />
 {/if}
diff --git a/plugins/activity-assets/lang/cs.json b/plugins/activity-assets/lang/cs.json
index 80e6ef2802..a2c296e2fe 100644
--- a/plugins/activity-assets/lang/cs.json
+++ b/plugins/activity-assets/lang/cs.json
@@ -53,6 +53,8 @@
     "UpdatedObject": "Aktualizovaný {object}",
     "NewObjectType": "Nový {type}: {title}",
     "RemovedObjectType": "Odstraněný {type} : {title}",
-    "AttributeSetTo": "{name} nastaveno na {value}"
+    "AttributeSetTo": "{name} nastaveno na {value}",
+    "AddedTag": "Přidaný štítek: {title}",
+    "RemovedTag": "Odebráný štítek: {title}"
   }
 }
\ No newline at end of file
diff --git a/plugins/activity-assets/lang/de.json b/plugins/activity-assets/lang/de.json
index 5738bd1ac9..440a7e237e 100644
--- a/plugins/activity-assets/lang/de.json
+++ b/plugins/activity-assets/lang/de.json
@@ -53,6 +53,8 @@
     "UpdatedObject": "{object} aktualisiert",
     "NewObjectType": "Neues {objectType}",
     "RemovedObjectType": "{objectType} entfernt",
-    "AttributeSetTo": "{attribute} auf {value} gesetzt"
+    "AttributeSetTo": "{attribute} auf {value} gesetzt",
+    "AddedTag": "Tag hinzugefügt: {title}",
+    "RemovedTag": "Tag entfernt: {title}"
   }
 }
\ No newline at end of file
diff --git a/plugins/activity-assets/lang/en.json b/plugins/activity-assets/lang/en.json
index b461271500..e3181c7cae 100644
--- a/plugins/activity-assets/lang/en.json
+++ b/plugins/activity-assets/lang/en.json
@@ -53,6 +53,8 @@
     "UpdatedObject": "Updated {object}",
     "NewObjectType": "New {type}: {title}",
     "RemovedObjectType": "Removed {type} : {title}",
+    "AddedTag": "Added tag: {title}",
+    "RemovedTag": "Removed tag: {title}",
     "AttributeSetTo": "{name} set to {value}"
   }
 }
\ No newline at end of file
diff --git a/plugins/activity-assets/lang/es.json b/plugins/activity-assets/lang/es.json
index 90858833c5..fddad7133b 100644
--- a/plugins/activity-assets/lang/es.json
+++ b/plugins/activity-assets/lang/es.json
@@ -52,6 +52,8 @@
     "UpdatedObject": "Actualizado {object}",
     "NewObjectType": "Nuevo {type}: {title}",
     "RemovedObjectType": "Eliminado {type} : {title}",
-    "AttributeSetTo": "{name} establecido en {value}"
+    "AttributeSetTo": "{name} establecido en {value}",
+    "AddedTag": "Etiqueta añadida: {title}",
+    "RemovedTag": "Etiqueta eliminada: {title}"
   }
 }
\ No newline at end of file
diff --git a/plugins/activity-assets/lang/fr.json b/plugins/activity-assets/lang/fr.json
index c33b008990..176cb6e628 100644
--- a/plugins/activity-assets/lang/fr.json
+++ b/plugins/activity-assets/lang/fr.json
@@ -53,6 +53,8 @@
     "UpdatedObject": "Mis à jour {object}",
     "NewObjectType": "Nouveau {type}: {title}",
     "RemovedObjectType": "Supprimé {type} : {title}",
-    "AttributeSetTo": "{name} défini sur {value}"
+    "AttributeSetTo": "{name} défini sur {value}",
+    "AddedTag": "Tag ajouté: {title}",
+    "RemovedTag": "Tag supprimé: {title}"
   }
 }
\ No newline at end of file
diff --git a/plugins/activity-assets/lang/it.json b/plugins/activity-assets/lang/it.json
index 20f470d865..1099d1e8b6 100644
--- a/plugins/activity-assets/lang/it.json
+++ b/plugins/activity-assets/lang/it.json
@@ -53,6 +53,8 @@
     "UpdatedObject": "{object} aggiornato",
     "NewObjectType": "Nuovo {type}: {title}",
     "RemovedObjectType": "{type} rimosso: {title}",
-    "AttributeSetTo": "{name} impostato su {value}"
+    "AttributeSetTo": "{name} impostato su {value}",
+    "AddedTag": "Tag aggiunto: {title}",
+    "RemovedTag": "Tag rimosso: {title}"
   }
 }
diff --git a/plugins/activity-assets/lang/ja.json b/plugins/activity-assets/lang/ja.json
index 471fa21e93..7947e1e220 100644
--- a/plugins/activity-assets/lang/ja.json
+++ b/plugins/activity-assets/lang/ja.json
@@ -53,7 +53,9 @@
     "UpdatedObject": "{object} を更新しました",
     "NewObjectType": "新しい {type}：{title}",
     "RemovedObjectType": "{type} を削除：{title}",
-    "AttributeSetTo": "{name} を {value} に設定しました"
+    "AttributeSetTo": "{name} を {value} に設定しました",
+    "AddedTag": "タグを追加しました：{title}",
+    "RemovedTag": "タグを削除しました：{title}"
   }
 }
   
\ No newline at end of file
diff --git a/plugins/activity-assets/lang/pt.json b/plugins/activity-assets/lang/pt.json
index 37e59ddc80..cc37b6f2f0 100644
--- a/plugins/activity-assets/lang/pt.json
+++ b/plugins/activity-assets/lang/pt.json
@@ -52,6 +52,8 @@
     "UpdatedObject": "Atualizado {object}",
     "NewObjectType": "Novo {type}: {title}",
     "RemovedObjectType": "Removido {type} : {title}",
-    "AttributeSetTo": "{name} definido para {value}"
+    "AttributeSetTo": "{name} definido para {value}",
+    "AddedTag": "Tag adicionado: {title}",
+    "RemovedTag": "Tag removido: {title}"
   }
 }
\ No newline at end of file
diff --git a/plugins/activity-assets/lang/ru.json b/plugins/activity-assets/lang/ru.json
index e52eb90fb3..fe8d330f44 100644
--- a/plugins/activity-assets/lang/ru.json
+++ b/plugins/activity-assets/lang/ru.json
@@ -53,6 +53,8 @@
     "UpdatedObject": "Обновил(а) {object}",
     "NewObjectType": "Новый(ые) {type}: {title}",
     "RemovedObjectType": "Удален(ы) {type} : {title}",
-    "AttributeSetTo": "{name} установлен на {value}"
+    "AttributeSetTo": "{name} установлен на {value}",
+    "AddedTag": "Добавлен тег: {title}",
+    "RemovedTag": "Удален тег: {title}"
   }
 }
\ No newline at end of file
diff --git a/plugins/activity-assets/lang/zh.json b/plugins/activity-assets/lang/zh.json
index 1e682c40e7..e3f17a5322 100644
--- a/plugins/activity-assets/lang/zh.json
+++ b/plugins/activity-assets/lang/zh.json
@@ -53,6 +53,8 @@
     "UpdatedObject": "更新 {object}",
     "NewObjectType": "新 {type}: {title}",
     "RemovedObjectType": "移除 {type} : {title}",
-    "AttributeSetTo": "{name} 设置为 {value}"
+    "AttributeSetTo": "{name} 设置为 {value}",
+    "AddedTag": "添加标签: {title}",
+    "RemovedTag": "移除标签: {title}"
   }
 }
diff --git a/plugins/activity/src/index.ts b/plugins/activity/src/index.ts
index 450163312d..6952b93960 100644
--- a/plugins/activity/src/index.ts
+++ b/plugins/activity/src/index.ts
@@ -320,7 +320,9 @@ export default plugin(activityId, {
     UpdatedObject: '' as IntlString,
     NewObjectType: '' as IntlString,
     RemovedObjectType: '' as IntlString,
-    AttributeSetTo: '' as IntlString
+    AttributeSetTo: '' as IntlString,
+    AddedTag: '' as IntlString,
+    RemovedTag: '' as IntlString
   },
   component: {
     Activity: '' as AnyComponent,
diff --git a/server-plugins/activity-resources/src/newActivity.ts b/server-plugins/activity-resources/src/newActivity.ts
index 1c03f155ee..93132b9614 100644
--- a/server-plugins/activity-resources/src/newActivity.ts
+++ b/server-plugins/activity-resources/src/newActivity.ts
@@ -162,11 +162,11 @@ async function getUpdateText (update: ActivityUpdate, card: Card, hierarchy: Hie
     const clazz = hierarchy.getClass(update.tag)
     if (update.action === 'add') {
       const tagName = await translate(clazz.label, {})
-      return await translate(activity.string.NewObjectType, { type: 'tag', title: tagName })
+      return await translate(activity.string.AddedTag, { title: tagName })
     }
     if (update.action === 'remove') {
       const tagName = await translate(clazz.label, {})
-      return await translate(activity.string.RemovedObjectType, { type: 'tag', title: tagName })
+      return await translate(activity.string.RemovedTag, { title: tagName })
     }
   }
   return undefined