From eef1bd2e0dc1d1d2f1a756d4f016fd82700ffb89 Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Mon, 23 Sep 2024 09:56:45 +0400
Subject: [PATCH] Group activity by time in document sidebar and fix double
 show more (#6679)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 .../attributes/SetAttributesPresenter.svelte          |  1 +
 .../src/components/sidebar/Activity.svelte            | 11 +++++++++--
 .../src/components/MarkupDiffPresenter.svelte         | 11 +++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte b/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte
index 605c857b63..e50a586b7a 100644
--- a/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte
+++ b/plugins/activity-resources/src/components/doc-update-message/attributes/SetAttributesPresenter.svelte
@@ -69,6 +69,7 @@
         attribute={attributeModel.attribute}
         value={values[0]}
         {prevValue}
+        withShowMore={false}
         showOnlyDiff
       />
     {/if}
diff --git a/plugins/document-resources/src/components/sidebar/Activity.svelte b/plugins/document-resources/src/components/sidebar/Activity.svelte
index 2a55727b35..c6a02152f9 100644
--- a/plugins/document-resources/src/components/sidebar/Activity.svelte
+++ b/plugins/document-resources/src/components/sidebar/Activity.svelte
@@ -16,7 +16,12 @@
 -->
 <script lang="ts">
   import activity, { ActivityMessage } from '@hcengineering/activity'
-  import { ActivityFilter, ActivityMessagePresenter, canGroupMessages } from '@hcengineering/activity-resources'
+  import {
+    ActivityFilter,
+    ActivityMessagePresenter,
+    canGroupMessages,
+    combineActivityMessages
+  } from '@hcengineering/activity-resources'
   import { SortingOrder } from '@hcengineering/core'
   import { Document } from '@hcengineering/document'
   import { createQuery } from '@hcengineering/presentation'
@@ -33,7 +38,9 @@
     activity.class.ActivityMessage,
     { attachedTo: value._id, space: value.space },
     (res) => {
-      messages = res
+      void combineActivityMessages(res).then((res) => {
+        messages = res
+      })
     },
     {
       sort: {
diff --git a/plugins/view-resources/src/components/MarkupDiffPresenter.svelte b/plugins/view-resources/src/components/MarkupDiffPresenter.svelte
index 3a81fdb9fd..f756ec3753 100644
--- a/plugins/view-resources/src/components/MarkupDiffPresenter.svelte
+++ b/plugins/view-resources/src/components/MarkupDiffPresenter.svelte
@@ -23,6 +23,7 @@
   export let value: Markup | undefined
   export let prevValue: Markup | undefined = undefined
   export let attribute: AnyAttribute | undefined = undefined
+  export let withShowMore = true
 
   export let showOnlyDiff: boolean = false
 
@@ -85,8 +86,14 @@
   }
 </script>
 
-<ShowMore>
+{#if withShowMore}
+  <ShowMore>
+    {#key [value, prevValue]}
+      <MarkupDiffViewer objectClass={attribute?.attributeOf} {content} {comparedVersion} />
+    {/key}
+  </ShowMore>
+{:else}
   {#key [value, prevValue]}
     <MarkupDiffViewer objectClass={attribute?.attributeOf} {content} {comparedVersion} />
   {/key}
-</ShowMore>
+{/if}