From a4379d72d113d453be39bc8f36076546b8e781ea Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Mon, 23 Sep 2024 17:41:56 +0400
Subject: [PATCH 01/10] Fix thread blink in inbox (#6686)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 .../src/components/ChannelScrollView.svelte   |  3 +-
 .../src/components/threads/ThreadView.svelte  |  9 +++-
 plugins/chunter-resources/src/navigation.ts   | 13 +++--
 plugins/notification-assets/lang/ru.json      |  2 +-
 .../components/DocNotifyContextCard.svelte    |  4 +-
 .../src/components/inbox/Inbox.svelte         |  3 +-
 plugins/notification-resources/src/utils.ts   | 47 ++++++++++++++-----
 .../src/components/issues/IssuesView.svelte   |  2 +-
 .../components/sidebar/SidebarExpanded.svelte | 35 +++++---------
 plugins/workbench-resources/src/sidebar.ts    |  6 ++-
 10 files changed, 73 insertions(+), 51 deletions(-)

diff --git a/plugins/chunter-resources/src/components/ChannelScrollView.svelte b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
index d02a25591e..1863acb886 100644
--- a/plugins/chunter-resources/src/components/ChannelScrollView.svelte
+++ b/plugins/chunter-resources/src/components/ChannelScrollView.svelte
@@ -500,9 +500,9 @@
     updateSelectedDate()
 
     if (selectedMessageId !== undefined && messages.some(({ _id }) => _id === selectedMessageId)) {
-      isScrollInitialized = true
       await wait()
       scrollToMessage()
+      isScrollInitialized = true
       isInitialScrolling = false
     } else if (separatorIndex === -1) {
       await wait()
@@ -800,6 +800,7 @@
       bind:divBox={scrollContentBox}
       noStretch={false}
       disableOverscroll
+      horizontal={false}
       onScroll={handleScroll}
       onResize={handleResize}
     >
diff --git a/plugins/chunter-resources/src/components/threads/ThreadView.svelte b/plugins/chunter-resources/src/components/threads/ThreadView.svelte
index 180a132bc5..9a249b28de 100644
--- a/plugins/chunter-resources/src/components/threads/ThreadView.svelte
+++ b/plugins/chunter-resources/src/components/threads/ThreadView.svelte
@@ -143,6 +143,8 @@
 
     dispatch('channel')
   }
+
+  $: messagesStore = dataProvider?.messagesStore
 </script>
 
 {#if showHeader}
@@ -167,10 +169,13 @@
           <ThreadParentMessage {message} />
         </div>
 
-        {#if message.replies && message.replies > 0}
+        {#if (message.replies ?? $messagesStore?.length ?? 0) > 0}
           <div class="separator">
             <div class="label lower">
-              <Label label={activity.string.RepliesCount} params={{ replies: message.replies }} />
+              <Label
+                label={activity.string.RepliesCount}
+                params={{ replies: message.replies ?? $messagesStore?.length ?? 1 }}
+              />
             </div>
             <div class="line" />
           </div>
diff --git a/plugins/chunter-resources/src/navigation.ts b/plugins/chunter-resources/src/navigation.ts
index 668543fb96..6e9cf29e75 100644
--- a/plugins/chunter-resources/src/navigation.ts
+++ b/plugins/chunter-resources/src/navigation.ts
@@ -150,6 +150,7 @@ export async function buildThreadLink (
     loc.path[2] = chunterId
   }
 
+  loc.query = { message: '' }
   loc.path[3] = objectURI
   loc.path[4] = threadParent
   loc.fragment = undefined
@@ -177,7 +178,7 @@ export async function replyToThread (message: ActivityMessage, e: Event): Promis
     }
   }
 
-  void openThreadInSidebar(message._id, message)
+  await openThreadInSidebar(message._id, message)
   if (loc.path[2] !== chunterId && loc.path[2] !== notificationId) {
     return
   }
@@ -326,10 +327,14 @@ export async function openThreadInSidebar (_id: Ref<ActivityMessage>, msg?: Acti
   const name = (await getChannelName(object._id, object._class, object)) ?? (await translate(titleIntl, {}))
   const tabName = await translate(chunter.string.ThreadIn, { name })
   const loc = getCurrentLocation()
-  const allowedPath = loc.path.join('/')
 
-  const currentTAbs = get(sidebarStore).widgetsState.get(widget._id)?.tabs ?? []
-  const tabsToClose = currentTAbs.filter((t) => t.isPinned !== true && t.allowedPath === allowedPath).map((t) => t.id)
+  if (loc.path[2] === chunterId || loc.path[2] === notificationId) {
+    loc.path[4] = message._id
+  }
+
+  const allowedPath = loc.path.join('/')
+  const currentTabs = get(sidebarStore).widgetsState.get(widget._id)?.tabs ?? []
+  const tabsToClose = currentTabs.filter((t) => t.isPinned !== true && t.allowedPath === allowedPath).map((t) => t.id)
 
   if (tabsToClose.length > 0) {
     sidebarStore.update((s) => {
diff --git a/plugins/notification-assets/lang/ru.json b/plugins/notification-assets/lang/ru.json
index ada9f03cc5..f46bcb90e7 100644
--- a/plugins/notification-assets/lang/ru.json
+++ b/plugins/notification-assets/lang/ru.json
@@ -11,7 +11,7 @@
     "Remove": "Удалить нотификацию",
     "RemoveAll": "Удалить все нотификации",
     "MarkAllAsRead": "Отметить все нотификации как прочитанные",
-    "MarkAsRead": "Отметить нотификация прочитанной",
+    "MarkAsRead": "Отметить прочитанным",
     "MarkAsUnread": "Отметить непрочитанным",
     "Archive": "Архивировать",
     "Inbox": "Входящие",
diff --git a/plugins/notification-resources/src/components/DocNotifyContextCard.svelte b/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
index 9c5b3fd89a..d9c8b7ef75 100644
--- a/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
+++ b/plugins/notification-resources/src/components/DocNotifyContextCard.svelte
@@ -198,7 +198,7 @@
 <div
   class="card"
   on:click={() => {
-    dispatch('click', { context: value })
+    dispatch('click', { context: value, object })
   }}
 >
   {#if isLoading}
@@ -266,7 +266,7 @@
               on:click={(e) => {
                 e.preventDefault()
                 e.stopPropagation()
-                dispatch('click', { context: value, notification: group[0] })
+                dispatch('click', { context: value, notification: group[0], object })
               }}
             />
           </div>
diff --git a/plugins/notification-resources/src/components/inbox/Inbox.svelte b/plugins/notification-resources/src/components/inbox/Inbox.svelte
index 079dce0cc1..5365b49ea1 100644
--- a/plugins/notification-resources/src/components/inbox/Inbox.svelte
+++ b/plugins/notification-resources/src/components/inbox/Inbox.svelte
@@ -256,7 +256,7 @@
 
     const selectedNotification: InboxNotification | undefined = event?.detail?.notification
 
-    void selectInboxContext(linkProviders, selectedContext, selectedNotification)
+    void selectInboxContext(linkProviders, selectedContext, selectedNotification, event?.detail.object)
   }
 
   async function updateSelectedPanel (selectedContext?: DocNotifyContext): Promise<void> {
@@ -373,6 +373,7 @@
     }
   ]
   $: $deviceInfo.replacedPanel = replacedPanel
+
   onDestroy(() => {
     $deviceInfo.replacedPanel = undefined
     unsubscribeLoc()
diff --git a/plugins/notification-resources/src/utils.ts b/plugins/notification-resources/src/utils.ts
index 1c7795dd7f..b3710c8675 100644
--- a/plugins/notification-resources/src/utils.ts
+++ b/plugins/notification-resources/src/utils.ts
@@ -583,7 +583,8 @@ export function resetInboxContext (): void {
 export async function selectInboxContext (
   linkProviders: LinkIdProvider[],
   context: DocNotifyContext,
-  notification?: WithLookup<InboxNotification>
+  notification?: WithLookup<InboxNotification>,
+  object?: Doc
 ): Promise<void> {
   const client = getClient()
   const hierarchy = client.getHierarchy()
@@ -607,24 +608,42 @@ export async function selectInboxContext (
     const message = (notification as WithLookup<ActivityInboxNotification>)?.$lookup?.attachedTo
 
     if (objectClass === chunter.class.ThreadMessage) {
-      const thread = await client.findOne(
-        chunter.class.ThreadMessage,
-        {
-          _id: objectId as Ref<ThreadMessage>
-        },
-        { projection: { _id: 1, attachedTo: 1 } }
-      )
+      const thread =
+        object?._id === objectId
+          ? (object as ThreadMessage)
+          : await client.findOne(
+            chunter.class.ThreadMessage,
+            {
+              _id: objectId as Ref<ThreadMessage>
+            },
+            { projection: { _id: 1, attachedTo: 1 } }
+          )
 
-      void navigateToInboxDoc(linkProviders, objectId, objectClass, thread?.attachedTo, thread?._id)
+      void navigateToInboxDoc(
+        linkProviders,
+        thread?.objectId ?? objectId,
+        thread?.objectClass ?? objectClass,
+        thread?.attachedTo,
+        thread?._id
+      )
       return
     }
 
     if (isReactionMessage(message)) {
       const thread = loc.path[4] === objectId ? objectId : undefined
+      const reactedTo =
+        (object as ActivityMessage) ??
+        (await client.findOne(activity.class.ActivityMessage, { _id: message.attachedTo as Ref<ActivityMessage> }))
+      const isThread = hierarchy.isDerived(reactedTo._class, chunter.class.ThreadMessage)
+      const channelId = isThread ? (reactedTo as ThreadMessage)?.objectId : reactedTo?.attachedTo ?? objectId
+      const channelClass = isThread
+        ? (reactedTo as ThreadMessage)?.objectClass
+        : reactedTo?.attachedToClass ?? objectClass
+
       void navigateToInboxDoc(
         linkProviders,
-        objectId,
-        objectClass,
+        channelId,
+        channelClass,
         thread as Ref<ActivityMessage>,
         objectId as Ref<ActivityMessage>
       )
@@ -633,11 +652,13 @@ export async function selectInboxContext (
 
     const selectedMsg = (notification as ActivityInboxNotification)?.attachedTo
     const thread = selectedMsg !== objectId ? objectId : loc.path[4] === objectId ? objectId : undefined
+    const channelId = (object as ActivityMessage)?.attachedTo ?? message?.attachedTo ?? objectId
+    const channelClass = (object as ActivityMessage)?.attachedToClass ?? message?.attachedToClass ?? objectClass
 
     void navigateToInboxDoc(
       linkProviders,
-      objectId,
-      objectClass,
+      channelId,
+      channelClass,
       thread as Ref<ActivityMessage>,
       selectedMsg ?? (objectId as Ref<ActivityMessage>)
     )
diff --git a/plugins/tracker-resources/src/components/issues/IssuesView.svelte b/plugins/tracker-resources/src/components/issues/IssuesView.svelte
index a631ef50e0..d92449af9d 100644
--- a/plugins/tracker-resources/src/components/issues/IssuesView.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuesView.svelte
@@ -28,7 +28,7 @@
   $: if (query) updateSearchQuery(search)
   let resultQuery: DocumentQuery<Issue> = { ...searchQuery }
 
-  $: if (!label && title) {
+  $: if (title) {
     void translate(title, {}, $themeStore.language).then((res) => {
       label = res
     })
diff --git a/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte b/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
index 7209b04357..880d765e1d 100644
--- a/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
+++ b/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
@@ -24,7 +24,7 @@
     Breadcrumbs,
     getCurrentLocation
   } from '@hcengineering/ui'
-  import { onDestroy } from 'svelte'
+  import { onDestroy, onMount } from 'svelte'
 
   import { closeWidgetTab, sidebarStore, SidebarVariant, WidgetState, openWidgetTab, closeWidget } from '../../sidebar'
   import WidgetsBar from './widgets/WidgetsBar.svelte'
@@ -46,36 +46,15 @@
   $: widgetState = widget !== undefined ? $sidebarStore.widgetsState.get(widget._id) : undefined
 
   $: tabId = widgetState?.tab
-  $: tabs = getTabs(widget, widgetState)
+  $: tabs = widgetState?.tabs ?? []
   $: tab = tabId !== undefined ? tabs.find((it) => it.id === tabId) ?? tabs[0] : tabs[0]
 
   $: if ($sidebarStore.widget === undefined) {
     sidebarStore.update((s) => ({ ...s, variant: SidebarVariant.MINI }))
   }
 
-  function getTabs (widget?: Widget, state?: WidgetState): WidgetTab[] {
-    if (widget === undefined || !state?.tabs) return []
-    const loc = getCurrentLocation()
-
-    const result: WidgetTab[] = []
-    for (const tab of state.tabs) {
-      if (tab.allowedPath !== undefined && !tab.isPinned) {
-        const path = loc.path.join('/')
-        if (!path.startsWith(tab.allowedPath)) {
-          void handleTabClose(tab.id, widget)
-          continue
-        }
-      }
-
-      result.push(tab)
-    }
-
-    return result
-  }
-
-  const unsubscribe = locationStore.subscribe((loc: Location) => {
+  function closeWrongTabs (loc: Location): void {
     if (widget === undefined) return
-
     for (const tab of tabs) {
       if (tab.allowedPath !== undefined && !tab.isPinned) {
         const path = loc.path.join('/')
@@ -84,6 +63,14 @@
         }
       }
     }
+  }
+
+  const unsubscribe = locationStore.subscribe((loc: Location) => {
+    closeWrongTabs(loc)
+  })
+
+  onMount(() => {
+    closeWrongTabs(getCurrentLocation())
   })
 
   onDestroy(() => {
diff --git a/plugins/workbench-resources/src/sidebar.ts b/plugins/workbench-resources/src/sidebar.ts
index 8bf9a40e1b..ee1ff76cdd 100644
--- a/plugins/workbench-resources/src/sidebar.ts
+++ b/plugins/workbench-resources/src/sidebar.ts
@@ -203,7 +203,6 @@ export function openWidgetTab (widget: Ref<Widget>, tab: string): void {
 }
 
 export function createWidgetTab (widget: Widget, tab: WidgetTab, newTab = false): void {
-  openWidget(widget)
   const state = get(sidebarStore)
   const { widgetsState } = state
   const widgetState = widgetsState.get(widget._id)
@@ -225,6 +224,7 @@ export function createWidgetTab (widget: Widget, tab: WidgetTab, newTab = false)
   }
 
   widgetsState.set(widget._id, {
+    ...widgetState,
     _id: widget._id,
     tabs: newTabs,
     tab: tab.id
@@ -232,7 +232,9 @@ export function createWidgetTab (widget: Widget, tab: WidgetTab, newTab = false)
 
   sidebarStore.set({
     ...state,
-    widgetsState
+    widget: widget._id,
+    widgetsState,
+    variant: SidebarVariant.EXPANDED
   })
 }
 

From 56280dc3a4e9610bc373ce0ac2b860e576ea3d63 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Mon, 23 Sep 2024 21:24:16 +0700
Subject: [PATCH 02/10] UBERF-8233 Hide editor menu while user selecting
 (#6690)

---
 .../src/components/TextEditorToolbar.svelte   | 39 ++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/plugins/text-editor-resources/src/components/TextEditorToolbar.svelte b/plugins/text-editor-resources/src/components/TextEditorToolbar.svelte
index 4e42f52d6f..f1b6a156de 100644
--- a/plugins/text-editor-resources/src/components/TextEditorToolbar.svelte
+++ b/plugins/text-editor-resources/src/components/TextEditorToolbar.svelte
@@ -23,6 +23,7 @@
   } from '@hcengineering/text-editor'
   import { createQuery } from '@hcengineering/presentation'
   import { getResource } from '@hcengineering/platform'
+  import { onDestroy, onMount } from 'svelte'
 
   import { inlineToolbarKey } from './extension/inlineToolbar'
   import TextActionButton from './TextActionButton.svelte'
@@ -93,11 +94,40 @@
   $: categories.forEach((category) => {
     category.sort((a, b) => a[0] - b[0])
   })
+
+  let selecting = false
+
+  function handleMouseDown (): void {
+    function handleMouseMove (): void {
+      if (!editor.state.selection.empty) {
+        selecting = true
+        document.removeEventListener('mousemove', handleMouseMove)
+      }
+    }
+
+    function handleMouseUp (): void {
+      selecting = false
+
+      document.removeEventListener('mousemove', handleMouseMove)
+      document.removeEventListener('mouseup', handleMouseUp)
+    }
+
+    document.addEventListener('mousemove', handleMouseMove)
+    document.addEventListener('mouseup', handleMouseUp)
+  }
+
+  onMount(() => {
+    document.addEventListener('mousedown', handleMouseDown)
+  })
+
+  onDestroy(() => {
+    document.removeEventListener('mousedown', handleMouseDown)
+  })
 </script>
 
-<div bind:this={toolbar} style="visibility: hidden;">
-  {#if editor && visible && visibleActions.length > 0}
-    <div class="text-editor-toolbar buttons-group xsmall-gap mb-4">
+<div bind:this={toolbar} class="p-2" style="visibility: hidden;">
+  {#if editor && visible && !selecting && visibleActions.length > 0}
+    <div class="text-editor-toolbar buttons-group xsmall-gap">
       {#each Object.values(categories) as category, index}
         {#if index > 0}
           <div class="buttons-divider" />
@@ -113,8 +143,7 @@
 
 <style lang="scss">
   .text-editor-toolbar {
-    margin: -0.5rem -0.25rem 0.5rem;
-    padding: 0.375rem;
+    padding: 0.25rem;
     background-color: var(--theme-comp-header-color);
     border-radius: 0.5rem;
     box-shadow: var(--button-shadow);

From a9fcdfc61df7070c4ba92115b9b2429e132ff9d0 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Tue, 24 Sep 2024 00:22:08 +0700
Subject: [PATCH 03/10] UBERF-8240 Add editor extension for editable state
 change tracking (#6693)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 .../src/components/extension/codeblock.ts     |  3 +-
 .../src/components/extension/editable.ts      | 33 +++++++++++++++++++
 .../src/components/extension/focus.ts         |  1 +
 .../src/components/extension/submit.ts        |  1 +
 .../src/kits/editor-kit.ts                    |  2 ++
 5 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 plugins/text-editor-resources/src/components/extension/editable.ts

diff --git a/plugins/text-editor-resources/src/components/extension/codeblock.ts b/plugins/text-editor-resources/src/components/extension/codeblock.ts
index 40c2c4ebad..43d3c8dc0a 100644
--- a/plugins/text-editor-resources/src/components/extension/codeblock.ts
+++ b/plugins/text-editor-resources/src/components/extension/codeblock.ts
@@ -21,6 +21,7 @@ import { type Node as ProseMirrorNode } from '@tiptap/pm/model'
 import { Plugin, PluginKey } from '@tiptap/pm/state'
 import { Decoration, DecorationSet, type EditorView } from '@tiptap/pm/view'
 import { common, createLowlight } from 'lowlight'
+import { isChangeEditable } from './editable'
 
 type Lowlight = ReturnType<typeof createLowlight>
 
@@ -117,7 +118,7 @@ export function LanguageSelector (options: CodeBlockLowlightOptions): Plugin {
         return createDecorations(state.doc, options)
       },
       apply (tr, prev) {
-        if (tr.docChanged) {
+        if (tr.docChanged || isChangeEditable(tr)) {
           return createDecorations(tr.doc, options)
         }
 
diff --git a/plugins/text-editor-resources/src/components/extension/editable.ts b/plugins/text-editor-resources/src/components/extension/editable.ts
new file mode 100644
index 0000000000..b2dc5eca75
--- /dev/null
+++ b/plugins/text-editor-resources/src/components/extension/editable.ts
@@ -0,0 +1,33 @@
+import { Extension } from '@tiptap/core'
+import { type Transaction } from '@tiptap/pm/state'
+
+const metaKey = '$editable'
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface EditableOptions {}
+
+export interface EditableStorage {
+  isEditable: boolean | undefined
+}
+
+export function isChangeEditable (tr: Transaction): boolean {
+  return tr.getMeta(metaKey) !== undefined
+}
+
+export const EditableExtension = Extension.create<EditableOptions, EditableStorage>({
+  name: 'editable',
+
+  addStorage () {
+    return { isEditable: undefined }
+  },
+
+  onUpdate () {
+    if (this.editor.isEditable !== this.storage.isEditable) {
+      const { state, view } = this.editor
+
+      this.storage.isEditable = this.editor.isEditable
+      const tr = state.tr.setMeta(metaKey, this.storage.isEditable)
+      view.dispatch(tr)
+    }
+  }
+})
diff --git a/plugins/text-editor-resources/src/components/extension/focus.ts b/plugins/text-editor-resources/src/components/extension/focus.ts
index 778c6033cd..af23ad14d5 100644
--- a/plugins/text-editor-resources/src/components/extension/focus.ts
+++ b/plugins/text-editor-resources/src/components/extension/focus.ts
@@ -22,6 +22,7 @@ export interface FocusStorage {
 }
 
 export const FocusExtension = Extension.create<FocusOptions, FocusStorage>({
+  name: 'focus',
   addStorage () {
     return { canBlur: true }
   },
diff --git a/plugins/text-editor-resources/src/components/extension/submit.ts b/plugins/text-editor-resources/src/components/extension/submit.ts
index 37526fd390..bede6c2675 100644
--- a/plugins/text-editor-resources/src/components/extension/submit.ts
+++ b/plugins/text-editor-resources/src/components/extension/submit.ts
@@ -6,6 +6,7 @@ export interface SubmitOptions {
 }
 
 export const SubmitExtension = Extension.create<SubmitOptions>({
+  name: 'submit',
   addKeyboardShortcuts () {
     const shortcuts: Record<string, KeyboardShortcutCommand> = {
       Space: () => {
diff --git a/plugins/text-editor-resources/src/kits/editor-kit.ts b/plugins/text-editor-resources/src/kits/editor-kit.ts
index a852f7edde..3c986bd86f 100644
--- a/plugins/text-editor-resources/src/kits/editor-kit.ts
+++ b/plugins/text-editor-resources/src/kits/editor-kit.ts
@@ -23,6 +23,7 @@ import ListKeymap from '@tiptap/extension-list-keymap'
 import TableHeader from '@tiptap/extension-table-header'
 import 'prosemirror-codemark/dist/codemark.css'
 
+import { EditableExtension } from '../components/extension/editable'
 import { CodeBlockHighlighExtension, codeBlockHighlightOptions } from '../components/extension/codeblock'
 import { NoteExtension, type NoteOptions } from '../components/extension/note'
 import { FileExtension, type FileOptions } from '../components/extension/fileExt'
@@ -172,6 +173,7 @@ async function buildEditorKit (): Promise<Extension<EditorKitOptions, any>> {
                     }
                   })
                 ],
+                [110, EditableExtension],
                 [200, CodeBlockHighlighExtension.configure(codeBlockHighlightOptions)],
                 [210, CodeExtension.configure(codeOptions)],
                 [220, HardBreakExtension.configure({ shortcuts: mode })]

From f43f247b5c2fefa4482bd4cc7ff3ce7bc1c433df Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Tue, 24 Sep 2024 10:50:32 +0700
Subject: [PATCH 04/10] UBERF-8242 Fix scroll jumping in codeblock (#6695)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 .../text-editor-resources/src/components/extension/codeblock.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/text-editor-resources/src/components/extension/codeblock.ts b/plugins/text-editor-resources/src/components/extension/codeblock.ts
index 43d3c8dc0a..e7fb284c08 100644
--- a/plugins/text-editor-resources/src/components/extension/codeblock.ts
+++ b/plugins/text-editor-resources/src/components/extension/codeblock.ts
@@ -134,7 +134,7 @@ function createDecorations (doc: ProseMirrorNode, options: CodeBlockLowlightOpti
   doc.descendants((node, pos) => {
     if (node.type.name === CodeBlockLowlight.name) {
       decorations.push(
-        Decoration.widget(pos + node.nodeSize - 1, (view) => {
+        Decoration.widget(pos + 1, (view) => {
           const button = createLangButton(node.attrs.language)
 
           if (view.editable) {

From 2cf53576cb9bea3afb480758088c7f5978844950 Mon Sep 17 00:00:00 2001
From: MishaMgla <98478673+MishaMgla@users.noreply.github.com>
Date: Tue, 24 Sep 2024 06:51:56 +0300
Subject: [PATCH 05/10] tests: drive. basic tests (#6655)

Signed-off-by: MiZhuk <mikhail.avangarde@gmail.com>
---
 tests/sanity/tests/drive/drive.spec.ts        | 81 ++++++++++++++++
 .../model/drive/drive-create-edit-popup.ts    | 27 ++++++
 .../tests/model/drive/drive-drives-page.ts    | 95 +++++++++++++++++++
 .../tests/model/drive/drive-files-page.ts     | 48 ++++++++++
 .../tests/model/drive/drive-left-menu.ts      | 46 +++++++++
 tests/sanity/tests/model/drive/types.ts       | 12 +++
 6 files changed, 309 insertions(+)
 create mode 100644 tests/sanity/tests/drive/drive.spec.ts
 create mode 100644 tests/sanity/tests/model/drive/drive-create-edit-popup.ts
 create mode 100644 tests/sanity/tests/model/drive/drive-drives-page.ts
 create mode 100644 tests/sanity/tests/model/drive/drive-files-page.ts
 create mode 100644 tests/sanity/tests/model/drive/drive-left-menu.ts
 create mode 100644 tests/sanity/tests/model/drive/types.ts

diff --git a/tests/sanity/tests/drive/drive.spec.ts b/tests/sanity/tests/drive/drive.spec.ts
new file mode 100644
index 0000000000..fd072741b5
--- /dev/null
+++ b/tests/sanity/tests/drive/drive.spec.ts
@@ -0,0 +1,81 @@
+import { test } from '@playwright/test'
+import { PlatformSetting, PlatformURI } from '../utils'
+import { Drive } from '../model/drive/types'
+import { faker } from '@faker-js/faker'
+import { DriveLeftMenu } from '../model/drive/drive-left-menu'
+import { DriveCreateEditPopup } from '../model/drive/drive-create-edit-popup'
+import { DrivesPage } from '../model/drive/drive-drives-page'
+import { DriveFilesPage } from '../model/drive/drive-files-page'
+
+test.use({
+  storageState: PlatformSetting
+})
+
+test.describe('Drive tests', () => {
+  let leftMenu: DriveLeftMenu
+  let popupDrive: DriveCreateEditPopup
+  let drivesPage: DrivesPage
+  let filesPage: DriveFilesPage
+  let drive: Drive
+
+  test.beforeEach(async ({ page }) => {
+    popupDrive = new DriveCreateEditPopup(page)
+    leftMenu = new DriveLeftMenu(page)
+    drivesPage = new DrivesPage(page)
+    filesPage = new DriveFilesPage(page)
+    drive = {
+      name: faker.word.noun()
+    }
+    await (await page.goto(`${PlatformURI}/workbench/sanity-ws/drive`))?.finished()
+    await leftMenu.clickCreateNewDrive()
+    await popupDrive.createOrEditDrive(drive)
+    await leftMenu.clickDrives()
+  })
+
+  test('Check if drive exists at drives page', async () => {
+    await drivesPage.checkDriveExists(drive)
+  })
+
+  test('Create new folder, check if folder exists in drive tree', async () => {
+    const folder = faker.word.noun()
+    await drivesPage.createFolder(drive, folder)
+    await leftMenu.checkFolderExists(drive, folder)
+  })
+
+  test('Edit drive, rename drive, check if it was renamed', async () => {
+    const newDrive: Drive = {
+      name: faker.word.noun()
+    }
+    await drivesPage.clickEditDrive(drive)
+    await popupDrive.createOrEditDrive(newDrive)
+    await drivesPage.checkDriveExists(newDrive)
+    await drivesPage.checkDriveNotExists(drive)
+  })
+
+  test('Archive/unarchive drive, check drive archive status', async () => {
+    await drivesPage.archiveDrive(drive)
+    await drivesPage.checkIsArchived(drive)
+    await drivesPage.unarchiveDrive(drive)
+    await drivesPage.checkIsNotArchived(drive)
+  })
+
+  test('Leave/Join drive, check if user leaved/joined drive', async () => {
+    await drivesPage.leaveDrive(drive)
+    await drivesPage.checkUserNotJoinedDrive(drive)
+    await drivesPage.joinDrive(drive)
+    await drivesPage.checkUserJoinedDrive(drive)
+  })
+
+  test('Upload/rename/delete file, check file was uploaded, renamed and deleted', async () => {
+    await drivesPage.clickOnDrive(drive)
+    await leftMenu.clickUploadFiles()
+    const fileName = 'cat.jpeg'
+    await filesPage.uploadFile(fileName)
+    await filesPage.checkFileExists(fileName)
+    const newFileName = 'dog.jpeg'
+    await filesPage.renameFile(fileName, newFileName)
+    await filesPage.checkFileExists(newFileName)
+    await filesPage.deleteFile(newFileName)
+    await filesPage.checkFileNotExists(newFileName)
+  })
+})
diff --git a/tests/sanity/tests/model/drive/drive-create-edit-popup.ts b/tests/sanity/tests/model/drive/drive-create-edit-popup.ts
new file mode 100644
index 0000000000..73e7f06898
--- /dev/null
+++ b/tests/sanity/tests/model/drive/drive-create-edit-popup.ts
@@ -0,0 +1,27 @@
+import { type Locator, type Page } from '@playwright/test'
+import { Drive } from './types'
+
+export class DriveCreateEditPopup {
+  readonly page: Page
+
+  constructor (page: Page) {
+    this.page = page
+  }
+
+  readonly popup = (): Locator => this.page.locator('div.popup')
+  readonly form = (): Locator => this.popup().locator('form[id^="drive:string:"]')
+  readonly buttonSelectSpaceType = (): Locator => this.form().locator('div.antiGrid-row:has-text("Space type") button')
+  readonly inputName = (): Locator => this.form().locator('div.antiGrid-row:has-text("Name") input')
+  readonly inputDescription = (): Locator => this.form().locator('div.antiGrid-row:has-text("Description") input')
+  readonly buttonSelectOwners = (): Locator => this.form().locator('div.antiGrid-row:has-text("Owners") button')
+  readonly togglePrivate = (): Locator =>
+    this.form().locator('div.antiGrid-row:has-text("Make private") .toggle-switch')
+
+  readonly buttonSelectMembers = (): Locator => this.form().locator('div.antiGrid-row:has-text("Members") button')
+  readonly buttonSubmit = (): Locator => this.form().locator('button[type="submit"]')
+
+  async createOrEditDrive (drive: Drive): Promise<void> {
+    await this.inputName().fill(drive.name)
+    await this.buttonSubmit().click()
+  }
+}
diff --git a/tests/sanity/tests/model/drive/drive-drives-page.ts b/tests/sanity/tests/model/drive/drive-drives-page.ts
new file mode 100644
index 0000000000..e2d411abb9
--- /dev/null
+++ b/tests/sanity/tests/model/drive/drive-drives-page.ts
@@ -0,0 +1,95 @@
+import { expect, type Locator, type Page } from '@playwright/test'
+import { ButtonDrivesContextMenu, Drive } from './types'
+import { CommonPage } from '../common-page'
+
+export class DrivesPage extends CommonPage {
+  page: Page
+
+  constructor (page: Page) {
+    super(page)
+    this.page = page
+  }
+
+  readonly cellDriveName = (driveName: string): Locator => this.page.getByRole('cell', { name: driveName }).first()
+
+  readonly buttonContextMenu = (buttonText: ButtonDrivesContextMenu): Locator =>
+    this.page.locator('div.antiPopup').getByRole('button', { name: buttonText })
+
+  readonly popupCreateFolder = (): Locator => this.page.locator('div.popup form[id="drive:string:CreateFolder"]')
+
+  readonly rowDrive = (driveName: string): Locator =>
+    this.page.locator('tbody tr').filter({
+      has: this.cellDriveName(driveName)
+    })
+
+  readonly buttonJoinDriveRow = (driveName: string): Locator =>
+    this.rowDrive(driveName).locator('td').nth(2).getByRole('button', { name: 'Join' })
+
+  readonly popupArchive = (): Locator => this.page.locator('.popup.endShow:text("archive")').first()
+
+  readonly cellArchiveStatusYes = (driveName: string): Locator =>
+    this.rowDrive(driveName).locator('td').last().locator(':text("Yes")')
+
+  async checkDriveExists (drive: Drive): Promise<void> {
+    await expect(this.cellDriveName(drive.name)).toBeVisible()
+  }
+
+  async checkDriveNotExists (drive: Drive): Promise<void> {
+    await expect(this.cellDriveName(drive.name)).not.toBeVisible()
+  }
+
+  async clickButtonDriveContextMenu (drive: Drive, buttonText: ButtonDrivesContextMenu): Promise<void> {
+    await this.cellDriveName(drive.name).click({ button: 'right' })
+    await this.buttonContextMenu(buttonText).click()
+  }
+
+  async createFolder (drive: Drive, folderName: string): Promise<void> {
+    await this.clickButtonDriveContextMenu(drive, 'Create folder')
+    await this.popupCreateFolder().locator('input').fill(folderName)
+    await this.popupCreateFolder().getByRole('button', { name: 'Create' }).last().click()
+  }
+
+  async clickEditDrive (drive: Drive): Promise<void> {
+    await this.clickButtonDriveContextMenu(drive, 'Edit drive')
+  }
+
+  async archiveDrive (drive: Drive): Promise<void> {
+    await this.clickButtonDriveContextMenu(drive, 'Archive')
+    await this.popupSubmitButton().click()
+    await this.popupArchive().waitFor({ state: 'detached' })
+  }
+
+  async unarchiveDrive (drive: Drive): Promise<void> {
+    await this.clickButtonDriveContextMenu(drive, 'Unarchive')
+    await this.popupSubmitButton().click()
+    await this.popupArchive().waitFor({ state: 'detached' })
+  }
+
+  async checkIsArchived (drive: Drive): Promise<void> {
+    await expect(this.cellArchiveStatusYes(drive.name)).toBeVisible()
+  }
+
+  async checkIsNotArchived (drive: Drive): Promise<void> {
+    await expect(this.cellArchiveStatusYes(drive.name)).not.toBeVisible()
+  }
+
+  async leaveDrive (drive: Drive): Promise<void> {
+    await this.clickButtonDriveContextMenu(drive, 'Leave')
+  }
+
+  async joinDrive (drive: Drive): Promise<void> {
+    await this.clickButtonDriveContextMenu(drive, 'Join')
+  }
+
+  async checkUserJoinedDrive (drive: Drive): Promise<void> {
+    await expect(this.buttonJoinDriveRow(drive.name)).not.toBeVisible()
+  }
+
+  async checkUserNotJoinedDrive (drive: Drive): Promise<void> {
+    await this.buttonJoinDriveRow(drive.name).waitFor({ state: 'visible' })
+  }
+
+  async clickOnDrive (drive: Drive): Promise<void> {
+    await this.cellDriveName(drive.name).locator('a').click()
+  }
+}
diff --git a/tests/sanity/tests/model/drive/drive-files-page.ts b/tests/sanity/tests/model/drive/drive-files-page.ts
new file mode 100644
index 0000000000..063ecff242
--- /dev/null
+++ b/tests/sanity/tests/model/drive/drive-files-page.ts
@@ -0,0 +1,48 @@
+import { expect, type Locator, type Page } from '@playwright/test'
+import { ButtonFilesContextMenu } from './types'
+import { uploadFile } from '../../utils'
+import { CommonPage } from '../common-page'
+
+export class DriveFilesPage extends CommonPage {
+  page: Page
+
+  constructor (page: Page) {
+    super(page)
+    this.page = page
+  }
+
+  readonly leftMenu = (): Locator => this.page.locator('.antiPanel-wrap__content.hulyNavPanel-container')
+  readonly buttonConfirmUpload = (): Locator => this.page.locator('.popup button').last()
+  readonly linkFile = (fileName: string): Locator => this.page.locator(`td:has(span:text-is("${fileName}")) a`).first()
+  readonly buttonContextMenu = (buttonText: ButtonFilesContextMenu): Locator =>
+    this.page.locator('div.antiPopup').getByRole('button', { name: buttonText })
+
+  async uploadFile (fileName: string): Promise<void> {
+    await uploadFile(this.page, fileName, 'My device')
+    await this.buttonConfirmUpload().click()
+  }
+
+  async checkFileExists (fileName: string): Promise<void> {
+    await expect(this.linkFile(fileName)).toBeVisible()
+  }
+
+  async checkFileNotExists (fileName: string): Promise<void> {
+    await expect(this.linkFile(fileName)).not.toBeVisible()
+  }
+
+  async clickFilesContextMenu (fileName: string, buttonText: ButtonFilesContextMenu): Promise<void> {
+    await this.linkFile(fileName).click({ button: 'right' })
+    await this.buttonContextMenu(buttonText).click()
+  }
+
+  async renameFile (fileName: string, newFileName: string): Promise<void> {
+    await this.clickFilesContextMenu(fileName, 'Rename')
+    await this.page.locator('.popup input').fill(newFileName)
+    await this.pressYesForPopup(this.page)
+  }
+
+  async deleteFile (fileName: string): Promise<void> {
+    await this.clickFilesContextMenu(fileName, 'Delete')
+    await this.pressYesForPopup(this.page)
+  }
+}
diff --git a/tests/sanity/tests/model/drive/drive-left-menu.ts b/tests/sanity/tests/model/drive/drive-left-menu.ts
new file mode 100644
index 0000000000..bc469c2fb2
--- /dev/null
+++ b/tests/sanity/tests/model/drive/drive-left-menu.ts
@@ -0,0 +1,46 @@
+import { expect, type Locator, type Page } from '@playwright/test'
+import { Drive } from './types'
+
+export class DriveLeftMenu {
+  page: Page
+
+  constructor (page: Page) {
+    this.page = page
+  }
+
+  readonly leftMenu = (): Locator => this.page.locator('.antiPanel-wrap__content.hulyNavPanel-container')
+  readonly buttonCreateDrive = (): Locator => this.page.locator('button#tree-drives')
+  readonly buttonUploadFiles = (): Locator => this.leftMenu().getByRole('button', { name: 'Upload files' })
+  readonly buttonDrives = (): Locator => this.page.getByRole('link', { name: 'Drives' }).getByRole('button')
+  readonly groupHeaderDrive = (): Locator => this.page.getByRole('button', { name: 'Drive', exact: true })
+  readonly treeDrives = (): Locator => this.leftMenu().locator('#navGroup-tree-drives')
+  readonly buttonDriveInTree = (drive: Drive): Locator =>
+    this.treeDrives().locator('.hulyNavGroup-container').getByRole('button', { name: drive.name })
+
+  readonly driveContainer = (drive: Drive): Locator =>
+    this.treeDrives()
+      .locator('.hulyNavGroup-container')
+      .filter({
+        has: this.page.locator(':scope').getByRole('button', { name: drive.name })
+      })
+
+  readonly buttonFolderInDrive = (drive: Drive, folder: string): Locator =>
+    this.driveContainer(drive).getByRole('button', { name: folder })
+
+  async clickCreateNewDrive (): Promise<void> {
+    await this.groupHeaderDrive().hover()
+    await this.buttonCreateDrive().click()
+  }
+
+  async clickDrives (): Promise<void> {
+    await this.buttonDrives().click()
+  }
+
+  async checkFolderExists (drive: Drive, folder: string): Promise<void> {
+    await expect(this.buttonFolderInDrive(drive, folder)).toBeVisible()
+  }
+
+  async clickUploadFiles (): Promise<void> {
+    await this.buttonUploadFiles().click()
+  }
+}
diff --git a/tests/sanity/tests/model/drive/types.ts b/tests/sanity/tests/model/drive/types.ts
new file mode 100644
index 0000000000..812c485bae
--- /dev/null
+++ b/tests/sanity/tests/model/drive/types.ts
@@ -0,0 +1,12 @@
+export interface Drive {
+  spaceType?: string
+  name: string
+  description?: string
+  owners?: string[]
+  private?: boolean
+  members?: string[]
+}
+
+export type ButtonDrivesContextMenu = 'Create folder' | 'Edit drive' | 'Archive' | 'Unarchive' | 'Leave' | 'Join'
+
+export type ButtonFilesContextMenu = 'Rename' | 'Download' | 'Move' | 'Delete'

From b08749330d04e4a4e359d5b70a5eb172f7b064d6 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Tue, 24 Sep 2024 10:36:32 +0500
Subject: [PATCH 06/10] Fix clear todo description (#6697)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 server-plugins/time-resources/src/index.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/server-plugins/time-resources/src/index.ts b/server-plugins/time-resources/src/index.ts
index d4663f9542..20948b8c9e 100644
--- a/server-plugins/time-resources/src/index.ts
+++ b/server-plugins/time-resources/src/index.ts
@@ -596,9 +596,6 @@ async function changeIssueDataHandler (control: TriggerControl, issueId: Ref<Iss
       if (data.title !== todo.title) {
         update.title = data.title
       }
-      if (data.description !== todo.description) {
-        update.description = data.description
-      }
       if (data.attachedSpace !== todo.attachedSpace) {
         update.attachedSpace = data.attachedSpace
       }
@@ -633,8 +630,8 @@ async function updateIssueHandler (tx: TxUpdateDoc<Issue>, control: TriggerContr
     res.push(...(await changeIssueStatusHandler(control, newStatus, tx.objectId)))
   }
   const name = tx.operations.title
-  const number = tx.operations.number
-  if (number !== undefined || name !== undefined) {
+  const space = tx.operations.space
+  if (space !== undefined || name !== undefined) {
     res.push(...(await changeIssueDataHandler(control, tx.objectId)))
   }
   return res

From ba5a7525d3ea74c1e81a02648060e5b233a30f21 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Tue, 24 Sep 2024 13:10:34 +0700
Subject: [PATCH 07/10] fix: adjust image size in message attachments (#6698)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 .../src/components/AttachmentAction.svelte    | 45 +++++++++++++++
 .../src/components/AttachmentActions.svelte   | 55 +++++++++----------
 .../components/AttachmentImagePreview.svelte  | 54 +++++++++---------
 .../src/components/AttachmentPreview.svelte   | 21 +++----
 4 files changed, 106 insertions(+), 69 deletions(-)
 create mode 100644 plugins/attachment-resources/src/components/AttachmentAction.svelte

diff --git a/plugins/attachment-resources/src/components/AttachmentAction.svelte b/plugins/attachment-resources/src/components/AttachmentAction.svelte
new file mode 100644
index 0000000000..5ca696292a
--- /dev/null
+++ b/plugins/attachment-resources/src/components/AttachmentAction.svelte
@@ -0,0 +1,45 @@
+<!--
+// Copyright © 2024 Hardcore Engineering Inc.
+//
+// Licensed under the Eclipse Public License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License. You may
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+-->
+<script lang="ts">
+  import { type AnySvelteComponent, ButtonIcon, IconSize } from '@hcengineering/ui'
+  import { Asset, IntlString } from '@hcengineering/platform'
+  import { ComponentType } from 'svelte'
+
+  export let label: IntlString
+  export let icon: Asset | AnySvelteComponent | ComponentType
+  export let iconProps: any | undefined = undefined
+  export let size: IconSize = 'small'
+  export let action: (ev: MouseEvent) => Promise<void> | void = async () => {}
+  export let opened: boolean = false
+  export let dataId: string | undefined = undefined
+
+  function onClick (ev: MouseEvent): void {
+    ev.stopPropagation()
+    ev.preventDefault()
+    void action(ev)
+  }
+</script>
+
+<ButtonIcon
+  {icon}
+  {iconProps}
+  iconSize={size}
+  size="small"
+  kind="tertiary"
+  pressed={opened}
+  {dataId}
+  tooltip={{ label }}
+  on:click={onClick}
+/>
diff --git a/plugins/attachment-resources/src/components/AttachmentActions.svelte b/plugins/attachment-resources/src/components/AttachmentActions.svelte
index 744fe2ccd2..9072bf146e 100644
--- a/plugins/attachment-resources/src/components/AttachmentActions.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentActions.svelte
@@ -14,29 +14,21 @@
 -->
 <script lang="ts">
   import { type Attachment } from '@hcengineering/attachment'
-  import { getEmbeddedLabel, getResource } from '@hcengineering/platform'
-  import {
+  import type { WithLookup } from '@hcengineering/core'
+  import { getResource } from '@hcengineering/platform'
+  import presentation, {
     FilePreviewPopup,
     canPreviewFile,
     getFileUrl,
     getPreviewAlignment,
     previewTypes
   } from '@hcengineering/presentation'
-  import {
-    ActionIcon,
-    IconMoreH,
-    IconOpen,
-    Menu,
-    Action as UIAction,
-    closeTooltip,
-    showPopup,
-    tooltip
-  } from '@hcengineering/ui'
+  import { IconMoreH, IconOpen, Menu, Action as UIAction, closeTooltip, showPopup, tooltip } from '@hcengineering/ui'
   import view, { Action } from '@hcengineering/view'
 
-  import type { WithLookup } from '@hcengineering/core'
-  import attachmentPlugin from '../plugin'
+  import AttachmentAction from './AttachmentAction.svelte'
   import FileDownload from './icons/FileDownload.svelte'
+  import attachmentPlugin from '../plugin'
 
   export let attachment: WithLookup<Attachment>
   export let isSaved = false
@@ -131,30 +123,37 @@
 </script>
 
 <div class="flex">
+  {#if canPreview}
+    <AttachmentAction
+      label={view.string.Open}
+      icon={IconOpen}
+      size="small"
+      dataId="open-in-sidebar"
+      action={showPreview}
+    />
+  {/if}
   <a
-    class="mr-1 flex-row-center gap-2 p-1"
     href={getFileUrl(attachment.file, attachment.name)}
     download={attachment.name}
     bind:this={download}
-    use:tooltip={{ label: getEmbeddedLabel(attachment.name) }}
+    use:tooltip={{ label: presentation.string.Download }}
     on:click|stopPropagation
   >
-    {#if canPreview}
-      <ActionIcon
-        icon={IconOpen}
-        size={'medium'}
-        action={(evt) => {
-          showPreview(evt)
-        }}
-      />
-    {/if}
-    <ActionIcon
+    <AttachmentAction
+      label={presentation.string.Download}
       icon={FileDownload}
-      size={'medium'}
+      size="small"
+      dataId="open-in-sidebar"
       action={() => {
         download.click()
       }}
     />
   </a>
-  <ActionIcon icon={IconMoreH} size={'medium'} action={showMenu} />
+  <AttachmentAction
+    label={view.string.MoreActions}
+    icon={IconMoreH}
+    size="small"
+    dataId="open-in-sidebar"
+    action={showMenu}
+  />
 </div>
diff --git a/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte b/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
index 78bbd44336..611003711b 100644
--- a/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentImagePreview.svelte
@@ -26,6 +26,7 @@
   interface Dimensions {
     width: 'auto' | number
     height: 'auto' | number
+    fit: 'cover' | 'contain'
   }
 
   const minSizeRem = 4
@@ -45,7 +46,8 @@
     if (size === 'auto') {
       return {
         width: 'auto',
-        height: 'auto'
+        height: 'auto',
+        fit: 'contain'
       }
     }
 
@@ -55,42 +57,41 @@
     if (!metadata) {
       return {
         width: preferredWidth,
-        height: preferredWidth
+        height: preferredWidth,
+        fit: 'contain'
       }
     }
 
     const { originalWidth, originalHeight } = metadata
-    const maxSize = maxSizeRem * parseFloat(getComputedStyle(document.documentElement).fontSize)
+    const fontSize = parseFloat(getComputedStyle(document.documentElement).fontSize)
+    const maxSize = maxSizeRem * fontSize
+    const minSize = minSizeRem * fontSize
 
     const width = Math.min(originalWidth, preferredWidth)
     const ratio = originalHeight / originalWidth
     const height = width * ratio
 
+    const fit = width < minSize || height < minSize ? 'cover' : 'contain'
+
     if (height > maxSize) {
       return {
         width: maxSize / ratio,
-        height: maxSize
+        height: maxSize,
+        fit
+      }
+    } else if (height < minSize) {
+      return {
+        width,
+        height: minSize,
+        fit
+      }
+    } else {
+      return {
+        width,
+        height,
+        fit
       }
     }
-
-    return {
-      width,
-      height
-    }
-  }
-
-  function getObjectFit (size: Dimensions): 'contain' | 'cover' {
-    if (size.width === 'auto' || size.height === 'auto') {
-      return 'contain'
-    }
-
-    const minSize = minSizeRem * parseFloat(getComputedStyle(document.documentElement).fontSize)
-
-    if (size.width < minSize || size.height < minSize) {
-      return 'cover'
-    }
-
-    return 'contain'
   }
 
   function getUrlSize (size: AttachmentImageSize): IconSize {
@@ -110,9 +111,9 @@
   {#await getBlobRef(value.file, value.name, sizeToWidth(urlSize)) then blobSrc}
     <img
       src={blobSrc.src}
-      style:object-fit={getObjectFit(dimensions)}
-      width={dimensions.width}
-      height={dimensions.height}
+      style:object-fit={dimensions.fit}
+      width="100%"
+      height="100%"
       srcset={blobSrc.srcset}
       alt={value.name}
     />
@@ -124,7 +125,6 @@
     max-width: 20rem;
     max-height: 20rem;
     border-radius: 0.75rem;
-    object-fit: contain;
     min-height: 4rem;
     min-width: 4rem;
   }
diff --git a/plugins/attachment-resources/src/components/AttachmentPreview.svelte b/plugins/attachment-resources/src/components/AttachmentPreview.svelte
index 7a1ecea86f..c190389330 100644
--- a/plugins/attachment-resources/src/components/AttachmentPreview.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentPreview.svelte
@@ -1,6 +1,6 @@
 <!--
 // Copyright © 2020, 2021 Anticrm Platform Contributors.
-// Copyright © 2021 Hardcore Engineering Inc.
+// Copyright © 2021, 2024 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -58,28 +58,28 @@
     }}
   >
     <AttachmentImagePreview {value} size={imageSize} />
-    <div class="actions conner">
+    <div class="actions">
       <AttachmentActions attachment={value} {isSaved} {removable} />
     </div>
   </div>
 {:else if type === 'audio'}
   <div class="buttonContainer">
     <AudioPlayer {value} />
-    <div class="actions conner" style:padding={'0.125rem 0.25rem'}>
+    <div class="actions" style:padding={'0.125rem 0.25rem'}>
       <AttachmentActions attachment={value} {isSaved} {removable} />
     </div>
   </div>
 {:else if type === 'video'}
   <div class="content buttonContainer flex-center">
     <AttachmentVideoPreview {value} preload={videoPreload} />
-    <div class="actions conner">
+    <div class="actions">
       <AttachmentActions attachment={value} {isSaved} {removable} />
     </div>
   </div>
 {:else}
   <div class="flex buttonContainer extraWidth">
     <AttachmentPresenter {value} />
-    <div class="actions conner">
+    <div class="actions">
       <AttachmentActions attachment={value} {isSaved} {removable} />
     </div>
   </div>
@@ -100,17 +100,10 @@
       position: absolute;
       top: 0.25rem;
       right: 0.25rem;
-      padding: 0.25rem;
+      padding: 0.125rem;
       background-color: var(--theme-comp-header-color);
       border: 1px solid var(--theme-divider-color);
-      border-radius: 0.75rem;
-
-      &.conner {
-        top: 0;
-        right: 0;
-        padding: 0.25rem;
-        border-radius: 0 0.4rem 0 0.25rem;
-      }
+      border-radius: 0.375rem;
     }
   }
 

From daf4247b07cf910c73a6879a9339f521abc9fe4f Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Tue, 24 Sep 2024 13:49:30 +0700
Subject: [PATCH 08/10] fix: report invalid content errors to analytics (#6699)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 plugins/text-editor-resources/package.json        |  1 +
 .../src/components/CollaborativeTextEditor.svelte | 15 +++++++++++++--
 .../src/components/TextEditor.svelte              |  5 +++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/plugins/text-editor-resources/package.json b/plugins/text-editor-resources/package.json
index 5c9dd05117..9fd642347b 100644
--- a/plugins/text-editor-resources/package.json
+++ b/plugins/text-editor-resources/package.json
@@ -42,6 +42,7 @@
     "@hcengineering/platform": "^0.6.11",
     "svelte": "^4.2.12",
     "@hcengineering/ui": "^0.6.15",
+    "@hcengineering/analytics": "^0.6.0",
     "@hcengineering/presentation": "^0.6.3",
     "@hcengineering/core": "^0.6.32",
     "@hcengineering/view": "^0.6.13",
diff --git a/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte b/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte
index 304395eba2..0b1982db3a 100644
--- a/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte
+++ b/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte
@@ -15,6 +15,7 @@
 //
 -->
 <script lang="ts">
+  import { Analytics } from '@hcengineering/analytics'
   import { type Space, type Class, type CollaborativeDoc, type Doc, type Ref } from '@hcengineering/core'
   import { IntlString, translate } from '@hcengineering/platform'
   import { getFileUrl, getImageSize, imageSizeToRatio } from '@hcengineering/presentation'
@@ -116,11 +117,12 @@
       objectAttr
     })
 
+  let contentError = false
   let localSynced = false
   let remoteSynced = false
 
   $: loading = !localSynced && !remoteSynced
-  $: editable = !readonly && remoteSynced
+  $: editable = !readonly && !contentError && remoteSynced
 
   void localProvider.loaded.then(() => (localSynced = true))
   void remoteProvider.loaded.then(() => (remoteSynced = true))
@@ -218,7 +220,10 @@
   }
 
   $: if (editor !== undefined) {
-    editor.setEditable(editable, true)
+    // When the content is invalid, we don't want to emit an update
+    // Preventing synchronization of the invalid content
+    const emitUpdate = !contentError
+    editor.setEditable(editable, emitUpdate)
   }
 
   // TODO: should be inside the editor
@@ -364,6 +369,7 @@
     await ph
 
     editor = new Editor({
+      enableContentCheck: true,
       element,
       editorProps: { attributes: mergeAttributes(defaultEditorAttributes, editorAttributes, { class: 'flex-grow' }) },
       extensions: [
@@ -432,6 +438,11 @@
 
         throttle.call(updateLastUpdateTime)
         dispatch('update')
+      },
+      onContentError: ({ error, disableCollaboration }) => {
+        disableCollaboration()
+        contentError = true
+        Analytics.handleError(error)
       }
     })
   })
diff --git a/plugins/text-editor-resources/src/components/TextEditor.svelte b/plugins/text-editor-resources/src/components/TextEditor.svelte
index 26e45a7946..ff018f894e 100644
--- a/plugins/text-editor-resources/src/components/TextEditor.svelte
+++ b/plugins/text-editor-resources/src/components/TextEditor.svelte
@@ -14,6 +14,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
+  import { Analytics } from '@hcengineering/analytics'
   import { Markup } from '@hcengineering/core'
   import { IntlString, translate } from '@hcengineering/platform'
   import { EmptyMarkup, getMarkup, markupToJSON } from '@hcengineering/text'
@@ -150,6 +151,7 @@
   onMount(() => {
     void ph.then(async () => {
       editor = new Editor({
+        enableContentCheck: true,
         element,
         editorProps: {
           attributes: mergeAttributes(defaultEditorAttributes, editorAttributes),
@@ -197,6 +199,9 @@
           content = getContent()
           dispatch('value', content)
           dispatch('update', content)
+        },
+        onContentError: ({ error }) => {
+          Analytics.handleError(error)
         }
       })
     })

From d849a5da1f2f451189b7cef926b3be0241e30e1a Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Tue, 24 Sep 2024 14:23:06 +0700
Subject: [PATCH 09/10] fix: remove workspace id from indexeddb document name
 (#6700)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 plugins/text-editor-resources/src/provider/indexeddb.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/plugins/text-editor-resources/src/provider/indexeddb.ts b/plugins/text-editor-resources/src/provider/indexeddb.ts
index 9ce1f2a0d1..d2aab95863 100644
--- a/plugins/text-editor-resources/src/provider/indexeddb.ts
+++ b/plugins/text-editor-resources/src/provider/indexeddb.ts
@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-import { getMetadata } from '@hcengineering/platform'
-import presentation from '@hcengineering/presentation'
 
 import { type Doc as YDoc } from 'yjs'
 import { IndexeddbPersistence } from 'y-indexeddb'
@@ -26,11 +24,7 @@ export class IndexeddbProvider extends IndexeddbPersistence implements Provider
   readonly awareness: Awareness | null = null
 
   constructor (documentId: string, doc: YDoc) {
-    const workspaceId: string = getMetadata(presentation.metadata.WorkspaceId) ?? ''
-
-    const name = `${workspaceId}/${documentId}`
-
-    super(name, doc)
+    super(documentId, doc)
 
     this.loaded = new Promise((resolve) => {
       this.on('synced', resolve)

From 9d5fe507d1325ef2ab4e584b4a31cd5dcecab045 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Tue, 24 Sep 2024 14:34:19 +0700
Subject: [PATCH 10/10] fix: ignore disabled workspaces in sync-files tool
 (#6701)

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 dev/tool/src/index.ts | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/dev/tool/src/index.ts b/dev/tool/src/index.ts
index b4369e4a20..e2ae3c88d1 100644
--- a/dev/tool/src/index.ts
+++ b/dev/tool/src/index.ts
@@ -1139,7 +1139,8 @@ export function devTool (
     .option('-m, --move <move>', 'When set to true, the files will be moved, otherwise copied', 'false')
     .option('-bl, --blobLimit <blobLimit>', 'A blob size limit in megabytes (default 50mb)', '50')
     .option('-c, --concurrency <concurrency>', 'Number of files being processed concurrently', '10')
-    .action(async (cmd: { workspace: string, move: string, blobLimit: string, concurrency: string }) => {
+    .option('--disabled', 'Include disabled workspaces', false)
+    .action(async (cmd: { workspace: string, move: string, blobLimit: string, concurrency: string, disabled: boolean }) => {
       const params = {
         blobSizeLimitMb: parseInt(cmd.blobLimit),
         concurrency: parseInt(cmd.concurrency),
@@ -1165,6 +1166,10 @@ export function devTool (
               if (cmd.workspace !== '' && workspace.workspace !== cmd.workspace) {
                 continue
               }
+              if (workspace.disabled === true && !cmd.disabled) {
+                console.log('ignore disabled workspace', workspace.workspace)
+                continue
+              }
 
               console.log('start', workspace.workspace, index, '/', workspaces.length)
               await moveFiles(toolCtx, getWorkspaceId(workspace.workspace), exAdapter, params)
@@ -1182,7 +1187,8 @@ export function devTool (
   program
     .command('sync-files')
     .option('-w, --workspace <workspace>', 'Selected workspace only', '')
-    .action(async (cmd: { workspace: string }) => {
+    .option('--disabled', 'Include disabled workspaces', false)
+    .action(async (cmd: { workspace: string, disabled: boolean }) => {
       const { mongodbUri } = prepareTools()
       await withDatabase(mongodbUri, async (db) => {
         await withStorage(mongodbUri, async (adapter) => {
@@ -1196,13 +1202,22 @@ export function devTool (
             workspaces.sort((a, b) => b.lastVisit - a.lastVisit)
 
             for (const workspace of workspaces) {
+              if (workspace.disabled === true && !cmd.disabled) {
+                console.log('ignore disabled workspace', workspace.workspace)
+                continue
+              }
+
               if (cmd.workspace !== '' && workspace.workspace !== cmd.workspace) {
                 continue
               }
 
-              console.log('start', workspace.workspace, index, '/', workspaces.length)
-              await syncFiles(toolCtx, getWorkspaceId(workspace.workspace), exAdapter)
-              console.log('done', workspace.workspace)
+              try {
+                console.log('start', workspace.workspace, index, '/', workspaces.length)
+                await syncFiles(toolCtx, getWorkspaceId(workspace.workspace), exAdapter)
+                console.log('done', workspace.workspace)
+              } catch (err) {
+                console.warn('failed to sync files', err)
+              }
 
               index += 1
             }