From ab3df02270607c421bca335eae30361a43e5096e Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Wed, 9 Oct 2024 15:19:00 +0400
Subject: [PATCH] Chat fixes (#6851)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 models/chunter/src/index.ts                    | 18 ++++++------------
 models/chunter/src/migration.ts                | 11 +++++++++++
 .../components/chat/navigator/NavItem.svelte   | 16 ++++++++++++++--
 .../src/components/NotifyMarker.svelte         | 12 +-----------
 4 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/models/chunter/src/index.ts b/models/chunter/src/index.ts
index 5f13dd5033..b8bb7da2ca 100644
--- a/models/chunter/src/index.ts
+++ b/models/chunter/src/index.ts
@@ -221,8 +221,12 @@ export function createModel (builder: Builder): void {
 
   builder.createDoc<ActivityMessageControl<ChunterSpace>>(activity.class.ActivityMessageControl, core.space.Model, {
     objectClass: chunter.class.DirectMessage,
-    skip: [{ _class: core.class.TxMixin }, { _class: core.class.TxCreateDoc }, { _class: core.class.TxRemoveDoc }],
-    allowedFields: ['members']
+    skip: [
+      { _class: core.class.TxMixin },
+      { _class: core.class.TxCreateDoc },
+      { _class: core.class.TxRemoveDoc },
+      { _class: core.class.TxUpdateDoc }
+    ]
   })
 
   builder.createDoc(activity.class.DocUpdateMessageViewlet, core.space.Model, {
@@ -241,16 +245,6 @@ export function createModel (builder: Builder): void {
     }
   })
 
-  builder.createDoc(activity.class.DocUpdateMessageViewlet, core.space.Model, {
-    objectClass: chunter.class.DirectMessage,
-    action: 'update',
-    config: {
-      members: {
-        presenter: chunter.activity.MembersChangedMessage
-      }
-    }
-  })
-
   builder.mixin(chunter.class.ChatMessage, core.class.Class, activity.mixin.ActivityMessagePreview, {
     presenter: chunter.component.ChatMessagePreview
   })
diff --git a/models/chunter/src/migration.ts b/models/chunter/src/migration.ts
index 14e1638d62..70d2c2151c 100644
--- a/models/chunter/src/migration.ts
+++ b/models/chunter/src/migration.ts
@@ -351,6 +351,17 @@ export const chunterOperation: MigrateOperation = {
         func: async (client) => {
           await removeDuplicatedDirects(client)
         }
+      },
+      {
+        state: 'remove-direct-members-messages',
+        func: async (client) => {
+          await client.deleteMany<DocUpdateMessage>(DOMAIN_ACTIVITY, {
+            _class: activity.class.DocUpdateMessage,
+            attachedToClass: chunter.class.DirectMessage,
+            action: 'update',
+            'attributeUpdates.attrKey': 'members'
+          })
+        }
       }
     ])
   },
diff --git a/plugins/chunter-resources/src/components/chat/navigator/NavItem.svelte b/plugins/chunter-resources/src/components/chat/navigator/NavItem.svelte
index aba8a60fec..d9aa6e54be 100644
--- a/plugins/chunter-resources/src/components/chat/navigator/NavItem.svelte
+++ b/plugins/chunter-resources/src/components/chat/navigator/NavItem.svelte
@@ -98,11 +98,15 @@
   <svelte:fragment slot="notify">
     {#if count != null && count > 0}
       <div class="antiHSpacer" />
-      <NotifyMarker {count} />
+      <div class="notify">
+        <NotifyMarker {count} />
+      </div>
       <div class="antiHSpacer" />
     {:else if secondaryNotifyMarker}
       <div class="antiHSpacer" />
-      <NotifyMarker count={0} kind="with-dot" />
+      <div class="notify">
+        <NotifyMarker count={0} kind="simple" size="xx-small" />
+      </div>
       <div class="antiHSpacer" />
     {/if}
   </svelte:fragment>
@@ -126,4 +130,12 @@
       background-color: var(--global-ui-highlight-BackgroundColor);
     }
   }
+
+  .notify {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 1rem;
+    height: 1rem;
+  }
 </style>
diff --git a/plugins/notification-resources/src/components/NotifyMarker.svelte b/plugins/notification-resources/src/components/NotifyMarker.svelte
index e4e5e19469..b9cf69670a 100644
--- a/plugins/notification-resources/src/components/NotifyMarker.svelte
+++ b/plugins/notification-resources/src/components/NotifyMarker.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   export let count: number = 0
-  export let kind: 'primary' | 'simple' | 'with-dot' = 'primary'
+  export let kind: 'primary' | 'simple' = 'primary'
   export let size: 'xx-small' | 'x-small' | 'small' | 'medium' = 'small'
 
   const maxNumber = 9
@@ -34,10 +34,6 @@
   <div class="notifyMarker {size} {kind}" />
 {/if}
 
-{#if kind === 'with-dot'}
-  <div class="notifyMarker {size} {kind}">●</div>
-{/if}
-
 <style lang="scss">
   .notifyMarker {
     display: flex;
@@ -48,7 +44,6 @@
     font-weight: 700;
 
     &.simple,
-    &.with-dot,
     &.primary {
       background-color: var(--global-higlight-Color);
       color: var(--global-on-accent-TextColor);
@@ -75,10 +70,5 @@
       height: 1.25rem;
       font-size: 0.625rem;
     }
-
-    &.with-dot {
-      font-weight: 400;
-      font-size: 0.25rem;
-    }
   }
 </style>