From f180ea4b10992adc6d94398d5edb62c7a894a89e Mon Sep 17 00:00:00 2001
From: Vyacheslav Tumanov <me@slavatumanov.me>
Date: Fri, 16 Jun 2023 10:04:53 +0500
Subject: [PATCH] UBER-424: description not saving fix (#3434)

Signed-off-by: Vyacheslav Tumanov <me@slavatumanov.me>
---
 .../AttachmentStyleBoxEditor.svelte           | 28 ++++++++++++-------
 .../src/components/AttachmentStyledBox.svelte |  1 -
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/plugins/attachment-resources/src/components/AttachmentStyleBoxEditor.svelte b/plugins/attachment-resources/src/components/AttachmentStyleBoxEditor.svelte
index fc4a05865d..12b44cad8c 100644
--- a/plugins/attachment-resources/src/components/AttachmentStyleBoxEditor.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentStyleBoxEditor.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Doc, Markup, updateAttribute } from '@hcengineering/core'
+  import { Class, Doc, Markup, Ref, updateAttribute } from '@hcengineering/core'
 
   import { IntlString } from '@hcengineering/platform'
   import { createQuery, getAttribute, getClient, KeyedAttribute } from '@hcengineering/presentation'
@@ -28,7 +28,8 @@
   export let placeholder: IntlString
   export let focusIndex = -1
   export let updateBacklinks: ((doc: Doc, description: Markup) => void) | undefined = undefined
-
+  let _id: Ref<Doc> | undefined = undefined
+  let _class: Ref<Class<Doc>> | undefined = undefined
   const client = getClient()
 
   const queryClient = createQuery()
@@ -36,13 +37,20 @@
   let description = ''
 
   let doc: Doc | undefined
-
-  $: queryClient.query(object._class, { _id: object._id }, async (result) => {
-    ;[doc] = result
-    if (doc) {
-      description = getAttribute(client, object, key)
-    }
-  })
+  function checkForNewObject (object: Doc) {
+    if (object._id !== _id) return true
+    if (object._class !== _class) return true
+    return false
+  }
+  $: object &&
+    queryClient.query(object._class, { _id: object._id }, async (result) => {
+      ;[doc] = result
+      if (doc && checkForNewObject(object)) {
+        _class = object._class
+        _id = object._id
+        description = getAttribute(client, object, key)
+      }
+    })
 
   const dispatch = createEventDispatcher()
 
@@ -56,7 +64,7 @@
 
     const old = getAttribute(client, object, key)
     if (description !== old) {
-      updateAttribute(client, object, object._class, key, description)
+      await updateAttribute(client, object, object._class, key, description)
       dispatch('saved', true)
       setTimeout(() => {
         dispatch('saved', false)
diff --git a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
index 7968718c15..1c13eec403 100644
--- a/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentStyledBox.svelte
@@ -365,7 +365,6 @@
       on:blur
       on:focus
       on:open-document
-      on:open-document
       on:attach={() => {
         attach()
       }}