From 6bf3ecd30aabed6e0f4931c5ca74fadf2c05f6f7 Mon Sep 17 00:00:00 2001
From: Kristina <kristin.fefelova@gmail.com>
Date: Tue, 25 Mar 2025 17:57:57 +0400
Subject: [PATCH] Fix thread open (#8344)

Signed-off-by: Kristina Fefelova <kristin.fefelova@gmail.com>
---
 models/workbench/src/index.ts                 | 11 +------
 .../src/components/sidebar/Sidebar.svelte     | 31 ++-----------------
 .../components/sidebar/SidebarExpanded.svelte |  5 ++-
 plugins/workbench/src/plugin.ts               |  2 --
 plugins/workbench/src/types.ts                | 19 +-----------
 5 files changed, 9 insertions(+), 59 deletions(-)

diff --git a/models/workbench/src/index.ts b/models/workbench/src/index.ts
index 6c073ffdef..6daa2958b1 100644
--- a/models/workbench/src/index.ts
+++ b/models/workbench/src/index.ts
@@ -24,17 +24,15 @@ import type {
   ApplicationNavModel,
   HiddenApplication,
   SpaceView,
-  TxSidebarEvent,
   ViewConfiguration,
   Widget,
   WidgetPreference,
   WidgetTab,
   WidgetType,
-  SidebarEvent,
   WorkbenchTab
 } from '@hcengineering/workbench'
 import { type AnyComponent } from '@hcengineering/ui/src/types'
-import core, { TClass, TDoc, TTx } from '@hcengineering/model-core'
+import core, { TClass, TDoc } from '@hcengineering/model-core'
 import presentation from '@hcengineering/model-presentation'
 
 import workbench from './plugin'
@@ -97,12 +95,6 @@ export class TWidgetPreference extends TPreference implements WidgetPreference {
   enabled!: boolean
 }
 
-@Model(workbench.class.TxSidebarEvent, core.class.Doc)
-export class TTxSidebarEvent extends TTx implements TxSidebarEvent {
-  event!: SidebarEvent
-  params!: Record<string, any>
-}
-
 @Model(workbench.class.WorkbenchTab, preference.class.Preference)
 @UX(workbench.string.Tab)
 export class TWorkbenchTab extends TPreference implements WorkbenchTab {
@@ -120,7 +112,6 @@ export function createModel (builder: Builder): void {
     TApplicationNavModel,
     TWidget,
     TWidgetPreference,
-    TTxSidebarEvent,
     TWorkbenchTab
   )
 
diff --git a/plugins/workbench-resources/src/components/sidebar/Sidebar.svelte b/plugins/workbench-resources/src/components/sidebar/Sidebar.svelte
index f993ff9d44..41ef14c127 100644
--- a/plugins/workbench-resources/src/components/sidebar/Sidebar.svelte
+++ b/plugins/workbench-resources/src/components/sidebar/Sidebar.svelte
@@ -13,14 +13,12 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Tx } from '@hcengineering/core'
-  import { addTxListener, createQuery, getClient, removeTxListener } from '@hcengineering/presentation'
+  import { createQuery, getClient } from '@hcengineering/presentation'
   import { panelstore } from '@hcengineering/ui'
-  import { OpenSidebarWidgetParams, SidebarEvent, TxSidebarEvent, WidgetPreference } from '@hcengineering/workbench'
-  import { onMount } from 'svelte'
+  import { WidgetPreference } from '@hcengineering/workbench'
 
   import workbench from '../../plugin'
-  import { createWidgetTab, openWidget, sidebarStore, SidebarVariant } from '../../sidebar'
+  import { sidebarStore, SidebarVariant } from '../../sidebar'
   import SidebarExpanded from './SidebarExpanded.svelte'
   import SidebarMini from './SidebarMini.svelte'
 
@@ -36,29 +34,6 @@
 
   $: mini = $sidebarStore.variant === SidebarVariant.MINI
   $: if ((!mini || mini) && $panelstore.panel?.refit !== undefined) $panelstore.panel.refit()
-
-  function txListener (txes: Tx[]): void {
-    const evt = txes.findLast(
-      (it) => it._class === workbench.class.TxSidebarEvent && evt.event === SidebarEvent.OpenWidget
-    ) as TxSidebarEvent
-    if (evt !== undefined) {
-      const params = evt.params as OpenSidebarWidgetParams
-      const widget = client.getModel().findAllSync(workbench.class.Widget, { _id: params.widget })[0]
-      if (widget === undefined) return
-      if (params.tab !== undefined) {
-        createWidgetTab(widget, params.tab)
-      } else {
-        openWidget(widget)
-      }
-    }
-  }
-
-  onMount(() => {
-    addTxListener(txListener)
-    return () => {
-      removeTxListener(txListener)
-    }
-  })
 </script>
 
 <div id="sidebar" class="antiPanel-application vertical sidebar-container" class:mini={mini || $sidebarStore.float}>
diff --git a/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte b/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
index 2e9a479256..6a8e6e4fdf 100644
--- a/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
+++ b/plugins/workbench-resources/src/components/sidebar/SidebarExpanded.svelte
@@ -73,7 +73,10 @@
   })
 
   onMount(() => {
-    closeWrongTabs(getCurrentLocation())
+    // We need to wait for location to be updated
+    setTimeout(() => {
+      closeWrongTabs(getCurrentLocation())
+    }, 100)
   })
 
   onDestroy(() => {
diff --git a/plugins/workbench/src/plugin.ts b/plugins/workbench/src/plugin.ts
index 2e7e1382ce..d61375ad80 100644
--- a/plugins/workbench/src/plugin.ts
+++ b/plugins/workbench/src/plugin.ts
@@ -25,7 +25,6 @@ import type {
   ApplicationNavModel,
   HiddenApplication,
   SpaceView,
-  TxSidebarEvent,
   Widget,
   WidgetPreference,
   WidgetTab,
@@ -43,7 +42,6 @@ export const workbenchPlugin = plugin(workbenchId, {
     HiddenApplication: '' as Ref<Class<HiddenApplication>>,
     Widget: '' as Ref<Class<Widget>>,
     WidgetPreference: '' as Ref<Class<WidgetPreference>>,
-    TxSidebarEvent: '' as Ref<Class<TxSidebarEvent<Record<string, any>>>>,
     WorkbenchTab: '' as Ref<Class<WorkbenchTab>>
   },
   mixin: {
diff --git a/plugins/workbench/src/types.ts b/plugins/workbench/src/types.ts
index 1660b81b89..420a5ec4a7 100644
--- a/plugins/workbench/src/types.ts
+++ b/plugins/workbench/src/types.ts
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-import type { AccountRole, AccountUuid, Class, Doc, DocumentQuery, Obj, Ref, Space, Tx } from '@hcengineering/core'
+import type { AccountRole, AccountUuid, Class, Doc, DocumentQuery, Obj, Ref, Space } from '@hcengineering/core'
 import { DocNotifyContext, InboxNotification } from '@hcengineering/notification'
 import type { Asset, IntlString, Resource } from '@hcengineering/platform'
 import type { Preference } from '@hcengineering/preference'
@@ -96,23 +96,6 @@ export interface WidgetTab {
   readonly?: boolean
 }
 
-/** @public */
-export enum SidebarEvent {
-  OpenWidget = 'openWidget'
-}
-
-/** @public */
-export interface OpenSidebarWidgetParams {
-  widget: Ref<Widget>
-  tab?: WidgetTab
-}
-
-/** @public */
-export interface TxSidebarEvent<T extends Record<string, any> = Record<string, any>> extends Tx {
-  event: SidebarEvent
-  params: T
-}
-
 /** @public */
 export interface WorkbenchTab extends Preference {
   attachedTo: AccountUuid