From cf8ff1be313792b23d708e79ceb536744ed8551f Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Thu, 18 Jan 2024 12:52:59 +0400
Subject: [PATCH] Make inbox messages more compact (#4378)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 .../ActivityInfoMessagePresenter.svelte       |  2 +
 .../ActivityMessagePresenter.svelte           |  2 +
 .../ActivityMessageTemplate.svelte            | 29 +++---
 .../DocUpdateMessagePresenter.svelte          |  4 +
 .../chat-message/ChatMessagePresenter.svelte  |  2 +
 .../threads/ThreadMessagePresenter.svelte     |  2 +
 .../ActivityInboxNotificationPresenter.svelte | 61 ++++--------
 .../CommonInboxNotificationPresenter.svelte   | 94 ++++++++-----------
 .../components/inbox/InboxFlatListView.svelte | 38 +++++---
 9 files changed, 116 insertions(+), 118 deletions(-)

diff --git a/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte b/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte
index e746cd565c..cd318f88cc 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityInfoMessagePresenter.svelte
@@ -37,6 +37,7 @@
   export let shouldScroll: boolean = false
   export let embedded: boolean = false
   export let withActions: boolean = true
+  export let withFlatActions: boolean = true
   export let excludedActions: string[] = []
   export let actions: Action[] = []
   export let onClick: (() => void) | undefined = undefined
@@ -70,6 +71,7 @@
   {withActions}
   {actions}
   {excludedActions}
+  {withFlatActions}
   viewlet={undefined}
   {onClick}
 >
diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
index f7c055e982..e0432cbac1 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityMessagePresenter.svelte
@@ -31,6 +31,7 @@
   export let skipLabel = false
   export let actions: Action[] = []
   export let excludedActions: string[] = []
+  export let withFlatActions: boolean = true
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -56,6 +57,7 @@
       hideReplies,
       actions,
       excludedActions,
+      withFlatActions,
       onClick,
       onReply
     }}
diff --git a/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte b/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
index cbde7f0b2c..d47432ffe7 100644
--- a/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
+++ b/plugins/activity-resources/src/components/activity-message/ActivityMessageTemplate.svelte
@@ -46,8 +46,10 @@
   export let shouldScroll: boolean = false
   export let embedded: boolean = false
   export let withActions: boolean = true
+  export let withFlatActions: boolean = true
   export let showEmbedded = false
   export let hideReplies = false
+  export let skipLabel = false
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -150,8 +152,9 @@
             </div>
           {/if}
 
-          <slot name="header" />
-
+          {#if !skipLabel}
+            <slot name="header" />
+          {/if}
           <span class="text-sm">{getDisplayTime(message.createdOn ?? 0)}</span>
         </div>
 
@@ -175,17 +178,19 @@
         class:opened={isActionMenuOpened || message.isPinned}
       >
         {#if withActions}
-          <AddReactionAction object={message} />
-          <PinMessageAction object={message} />
-          <SaveMessageAction object={message} />
+          {#if withFlatActions}
+            <AddReactionAction object={message} />
+            <PinMessageAction object={message} />
+            <SaveMessageAction object={message} />
 
-          <ActivityMessageExtensionComponent
-            kind="action"
-            {extensions}
-            props={{ object: message }}
-            on:close={handleActionMenuClosed}
-            on:open={handleActionMenuOpened}
-          />
+            <ActivityMessageExtensionComponent
+              kind="action"
+              {extensions}
+              props={{ object: message }}
+              on:close={handleActionMenuClosed}
+              on:open={handleActionMenuOpened}
+            />
+          {/if}
           {#if withActionMenu}
             <ActionIcon icon={IconMoreH} size="small" action={showMenu} />
           {/if}
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 06cecd723f..ffca62eb4c 100644
--- a/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
+++ b/plugins/activity-resources/src/components/doc-update-message/DocUpdateMessagePresenter.svelte
@@ -46,6 +46,8 @@
   export let showEmbedded = false
   export let hideReplies = false
   export let actions: Action[] = []
+  export let skipLabel = false
+  export let withFlatActions: boolean = true
   export let excludedActions: string[] = []
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
@@ -157,6 +159,8 @@
     {showEmbedded}
     {hideReplies}
     {actions}
+    {skipLabel}
+    {withFlatActions}
     {onClick}
     {onReply}
   >
diff --git a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
index 60f45e379f..1209ae7030 100644
--- a/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
+++ b/plugins/chunter-resources/src/components/chat-message/ChatMessagePresenter.svelte
@@ -41,6 +41,7 @@
   export let skipLabel = false
   export let actions: Action[] = []
   export let excludedActions: string[] = []
+  export let withFlatActions: boolean = true
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 
@@ -164,6 +165,7 @@
     actions={additionalActions}
     {showEmbedded}
     {hideReplies}
+    {withFlatActions}
     {onClick}
     {onReply}
   >
diff --git a/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte b/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
index 50cc1dfe23..89b330d673 100644
--- a/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
+++ b/plugins/chunter-resources/src/components/threads/ThreadMessagePresenter.svelte
@@ -25,6 +25,7 @@
   export let withActions: boolean = true
   export let showEmbedded = false
   export let skipLabel = false
+  export let withFlatActions: boolean = true
   export let onClick: (() => void) | undefined = undefined
   export let onReply: (() => void) | undefined = undefined
 </script>
@@ -39,6 +40,7 @@
   {showEmbedded}
   {embedded}
   {skipLabel}
+  {withFlatActions}
   {onClick}
   {onReply}
 />
diff --git a/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte b/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte
index 50b59b1921..04c20a967e 100644
--- a/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte
+++ b/plugins/notification-resources/src/components/inbox/ActivityInboxNotificationPresenter.svelte
@@ -23,7 +23,7 @@
   } from '@hcengineering/notification'
   import { ActivityMessagePresenter, combineActivityMessages } from '@hcengineering/activity-resources'
   import activity, { ActivityMessage, DisplayActivityMessage } from '@hcengineering/activity'
-  import { location, Action, CheckBox, getLocation, navigate, Component } from '@hcengineering/ui'
+  import { location, Action, getLocation, navigate, Component } from '@hcengineering/ui'
   import { getActions } from '@hcengineering/view-resources'
   import { getResource } from '@hcengineering/platform'
   import chunter from '@hcengineering/chunter'
@@ -35,7 +35,6 @@
   export let skipLabel = false
   export let viewlets: ActivityNotificationViewlet[] = []
   export let onClick: (() => void) | undefined = undefined
-  export let onCheck: ((isChecked: boolean) => void) | undefined = undefined
 
   const client = getClient()
   const messagesQuery = createQuery()
@@ -120,43 +119,23 @@
 </script>
 
 {#if displayMessage !== undefined}
-  <div class="notification gap-2 ml-2">
-    {#if !embedded}
-      <div class="mt-6">
-        <CheckBox
-          circle
-          kind="primary"
-          on:value={(event) => {
-            if (onCheck) {
-              onCheck(event.detail)
-            }
-          }}
-        />
-      </div>
-    {/if}
-    {#if viewlet}
-      <Component is={viewlet.presenter} props={{ message: displayMessage, notification: value, embedded, onClick }} />
-    {:else}
-      <ActivityMessagePresenter
-        value={displayMessage}
-        showNotify={!value.isViewed && !embedded}
-        isSelected={displayMessage._id === selectedMessageId}
-        excludedActions={[chunter.action.ReplyToThread]}
-        showEmbedded
-        {embedded}
-        {skipLabel}
-        {actions}
-        onReply={() => {
-          handleReply(displayMessage)
-        }}
-        {onClick}
-      />
-    {/if}
-  </div>
+  {#if viewlet}
+    <Component is={viewlet.presenter} props={{ message: displayMessage, notification: value, embedded, onClick }} />
+  {:else}
+    <ActivityMessagePresenter
+      value={displayMessage}
+      showNotify={!value.isViewed && !embedded}
+      isSelected={displayMessage._id === selectedMessageId}
+      excludedActions={[chunter.action.ReplyToThread]}
+      showEmbedded
+      {embedded}
+      {skipLabel}
+      {actions}
+      withFlatActions={false}
+      onReply={() => {
+        handleReply(displayMessage)
+      }}
+      {onClick}
+    />
+  {/if}
 {/if}
-
-<style lang="scss">
-  .notification {
-    display: flex;
-  }
-</style>
diff --git a/plugins/notification-resources/src/components/inbox/CommonInboxNotificationPresenter.svelte b/plugins/notification-resources/src/components/inbox/CommonInboxNotificationPresenter.svelte
index f76c3bcd94..fc354840b1 100644
--- a/plugins/notification-resources/src/components/inbox/CommonInboxNotificationPresenter.svelte
+++ b/plugins/notification-resources/src/components/inbox/CommonInboxNotificationPresenter.svelte
@@ -29,15 +29,14 @@
   import { ActionIcon, CheckBox, IconMoreH, Label, showPopup } from '@hcengineering/ui'
   import { getDocLinkTitle, Menu } from '@hcengineering/view-resources'
   import { ActivityDocLink } from '@hcengineering/activity-resources'
-  import activity from '@hcengineering/activity'
   import view from '@hcengineering/view'
 
   import { InboxNotificationsClientImpl } from '../../inboxNotificationsClient'
 
   export let value: CommonInboxNotification
   export let embedded = false
+  export let skipLabel = false
   export let onClick: (() => void) | undefined = undefined
-  export let onCheck: ((isChecked: boolean) => void) | undefined = undefined
 
   const objectQuery = createQuery()
   const client = getClient()
@@ -92,48 +91,35 @@
   }
 </script>
 
-<div class="flex-presenter gap-2 ml-2">
+<!-- svelte-ignore a11y-no-static-element-interactions -->
+<!-- svelte-ignore a11y-click-events-have-key-events -->
+<div class="root clear-mins flex-grow" on:click={onClick}>
   {#if !embedded}
-    <CheckBox
-      circle
-      kind="primary"
-      on:value={(event) => {
-        if (onCheck) {
-          onCheck(event.detail)
-        }
-      }}
-    />
-  {/if}
-  <!-- svelte-ignore a11y-no-static-element-interactions -->
-  <!-- svelte-ignore a11y-click-events-have-key-events -->
-  <div class="root clear-mins flex-grow" on:click={onClick}>
-    {#if !embedded}
-      {#if !value.isViewed}
-        <div class="notify" />
-      {/if}
-
-      {#if value.icon}
-        <SystemAvatar size="medium" icon={value.icon} iconProps={value.iconProps} />
-      {:else if person}
-        <Avatar size="medium" avatar={person.avatar} name={person.name} />
-      {:else}
-        <SystemAvatar size="medium" />
-      {/if}
-    {:else}
-      <div class="embeddedMarker" />
+    {#if !value.isViewed}
+      <div class="notify" />
     {/if}
-    <div class="content ml-2 w-full clear-mins">
-      <div class="header clear-mins">
-        {#if person}
-          <EmployeePresenter value={person} shouldShowAvatar={false} />
-        {:else}
-          <div class="strong">
-            <Label label={core.string.System} />
-          </div>
-        {/if}
-        {#if value.header}
-          <span class="text-sm lower"><Label label={value.header} /></span>
-        {/if}
+
+    {#if value.icon}
+      <SystemAvatar size="medium" icon={value.icon} iconProps={value.iconProps} />
+    {:else if person}
+      <Avatar size="medium" avatar={person.avatar} name={person.name} />
+    {:else}
+      <SystemAvatar size="medium" />
+    {/if}
+  {:else}
+    <div class="embeddedMarker" />
+  {/if}
+  <div class="content ml-2 w-full clear-mins">
+    <div class="header clear-mins">
+      {#if person}
+        <EmployeePresenter value={person} shouldShowAvatar={false} />
+      {:else}
+        <div class="strong">
+          <Label label={core.string.System} />
+        </div>
+      {/if}
+      {#if !skipLabel && value.header}
+        <span class="text-sm lower"><Label label={value.header} /></span>
 
         {#if object}
           {#await getDocLinkTitle(client, object._id, object._class, object) then linkTitle}
@@ -144,23 +130,23 @@
             />
           {/await}
         {/if}
+      {/if}
 
-        <span class="text-sm">{getDisplayTime(value.createdOn ?? 0)}</span>
-      </div>
-
-      <div class="flex-row-center">
-        <div class="customContent">
-          <MessageViewer message={content} />
-        </div>
-      </div>
+      <span class="text-sm">{getDisplayTime(value.createdOn ?? 0)}</span>
     </div>
 
-    {#if !embedded}
-      <div class="actions clear-mins flex flex-gap-2 items-center" class:opened={isActionMenuOpened}>
-        <ActionIcon icon={IconMoreH} size="small" action={showMenu} />
+    <div class="flex-row-center">
+      <div class="customContent">
+        <MessageViewer message={content} />
       </div>
-    {/if}
+    </div>
   </div>
+
+  {#if !embedded}
+    <div class="actions clear-mins flex flex-gap-2 items-center" class:opened={isActionMenuOpened}>
+      <ActionIcon icon={IconMoreH} size="small" action={showMenu} />
+    </div>
+  {/if}
 </div>
 
 <style lang="scss">
diff --git a/plugins/notification-resources/src/components/inbox/InboxFlatListView.svelte b/plugins/notification-resources/src/components/inbox/InboxFlatListView.svelte
index 2f730c2327..51e77bfba8 100644
--- a/plugins/notification-resources/src/components/inbox/InboxFlatListView.svelte
+++ b/plugins/notification-resources/src/components/inbox/InboxFlatListView.svelte
@@ -41,17 +41,33 @@
 <Scroller>
   {#each notifications as notification (notification._id)}
     <div animate:flip={{ duration: 500 }}>
-      <InboxNotificationPresenter
-        value={notification}
-        {viewlets}
-        onCheck={(isChecked) => handleCheck(notification, isChecked)}
-        onClick={() => {
-          dispatch('click', {
-            context: $notifyContextsStore.find(({ _id }) => _id === notification.docNotifyContext),
-            notification
-          })
-        }}
-      />
+      <div class="notification gap-2 ml-2">
+        <!--        <div class="mt-6">-->
+        <!--          <CheckBox-->
+        <!--            circle-->
+        <!--            kind="primary"-->
+        <!--            on:value={(event) => {-->
+        <!--              handleCheck(notification, event.detail)-->
+        <!--            }}-->
+        <!--          />-->
+        <!--        </div>-->
+        <InboxNotificationPresenter
+          value={notification}
+          {viewlets}
+          onClick={() => {
+            dispatch('click', {
+              context: $notifyContextsStore.find(({ _id }) => _id === notification.docNotifyContext),
+              notification
+            })
+          }}
+        />
+      </div>
     </div>
   {/each}
 </Scroller>
+
+<style lang="scss">
+  .notification {
+    display: flex;
+  }
+</style>