From 207e60a76e691261cad6a0d2c633508bdb40703d Mon Sep 17 00:00:00 2001
From: Andrey Sobolev <haiodo@users.noreply.github.com>
Date: Mon, 17 Feb 2025 13:10:46 +0700
Subject: [PATCH] Minor import fixes (#8017)

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
---
 models/activity/src/plugin.ts                            | 2 +-
 models/card/src/index.ts                                 | 2 +-
 models/card/src/plugin.ts                                | 2 +-
 models/chunter/src/types.ts                              | 2 +-
 models/controlled-documents/src/plugin.ts                | 2 +-
 models/document/src/plugin.ts                            | 2 +-
 models/drive/src/plugin.ts                               | 2 +-
 models/guest/src/index.ts                                | 2 +-
 models/guest/src/plugin.ts                               | 2 +-
 models/love/src/plugin.ts                                | 2 +-
 models/presence/src/plugin.ts                            | 2 +-
 models/print/src/plugin.ts                               | 2 +-
 models/task/src/index.ts                                 | 2 +-
 models/text-editor/src/index.ts                          | 2 +-
 models/time/src/index.ts                                 | 2 +-
 models/time/src/plugin.ts                                | 2 +-
 models/training/src/plugin.ts                            | 2 +-
 models/uploader/src/plugin.ts                            | 2 +-
 models/view/src/utils.ts                                 | 2 +-
 models/workbench/src/index.ts                            | 2 +-
 packages/platform-rig/profiles/assets/tsconfig.json      | 4 +++-
 packages/platform-rig/profiles/default/tsconfig.json     | 3 ++-
 packages/platform-rig/profiles/model/tsconfig.json       | 3 ++-
 packages/platform-rig/profiles/node/tsconfig.json        | 3 ++-
 packages/platform-rig/profiles/package/tsconfig.json     | 3 ++-
 packages/platform-rig/profiles/ui/tsconfig.json          | 3 ++-
 .../presentation/src/components/breadcrumbs/types.ts     | 2 +-
 packages/presentation/src/plugin.ts                      | 2 +-
 packages/presentation/src/types.ts                       | 2 +-
 .../src/components/AttachmentRefInput.svelte             | 9 ++++-----
 plugins/bitrix-resources/src/plugin.ts                   | 2 +-
 plugins/board-resources/src/plugin.ts                    | 2 +-
 plugins/card-resources/src/plugin.ts                     | 2 +-
 plugins/chunter-resources/src/plugin.ts                  | 2 +-
 plugins/contact-resources/src/plugin.ts                  | 2 +-
 plugins/controlled-documents-resources/src/plugin.ts     | 2 +-
 plugins/controlled-documents/src/plugin.ts               | 2 +-
 plugins/document-resources/src/plugin.ts                 | 2 +-
 plugins/document/src/plugin.ts                           | 2 +-
 plugins/drive/src/plugin.ts                              | 2 +-
 plugins/lead-resources/src/plugin.ts                     | 2 +-
 plugins/love-resources/src/plugin.ts                     | 4 ++--
 plugins/presence/src/plugin.ts                           | 2 +-
 plugins/print/src/plugin.ts                              | 2 +-
 plugins/products-resources/src/plugin.ts                 | 4 ++--
 plugins/products/src/plugin.ts                           | 2 +-
 .../src/components/CreateCandidate.svelte                | 1 -
 plugins/recruit-resources/src/plugin.ts                  | 4 ++--
 plugins/setting-resources/src/plugin.ts                  | 2 +-
 plugins/survey-resources/src/plugin.ts                   | 2 +-
 plugins/tags-resources/src/plugin.ts                     | 2 +-
 plugins/telegram-resources/src/plugin.ts                 | 2 +-
 plugins/templates-resources/src/plugin.ts                | 2 +-
 plugins/templates/src/index.ts                           | 6 +++---
 plugins/test-management/src/plugin.ts                    | 2 +-
 plugins/tracker-resources/src/plugin.ts                  | 4 ++--
 plugins/uploader-resources/src/plugin.ts                 | 2 +-
 plugins/uploader/src/plugin.ts                           | 2 +-
 plugins/view-resources/src/plugin.ts                     | 4 ++--
 plugins/view/src/index.ts                                | 2 +-
 .../workbench-resources/src/components/Navigator.svelte  | 2 +-
 plugins/workbench-resources/src/plugin.ts                | 2 +-
 plugins/workbench-resources/src/utils.ts                 | 7 +++----
 rush.json                                                | 4 ++--
 server/account/src/operations.ts                         | 1 +
 services/github/github-resources/src/plugin.ts           | 2 +-
 services/github/model-github/src/plugin.ts               | 2 +-
 67 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/models/activity/src/plugin.ts b/models/activity/src/plugin.ts
index 210ab46c36..f820672389 100644
--- a/models/activity/src/plugin.ts
+++ b/models/activity/src/plugin.ts
@@ -16,7 +16,7 @@ import { activityId, type ActivityMessage, type DocUpdateMessageViewlet } from '
 import activity from '@hcengineering/activity-resources/src/plugin'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
 import { type Doc, type Ref } from '@hcengineering/core'
-import type { Location } from '@hcengineering/ui'
+import type { Location } from '@hcengineering/ui/src/types'
 import {
   type Action,
   type ActionCategory,
diff --git a/models/card/src/index.ts b/models/card/src/index.ts
index e36e4f342d..6d41c44afb 100644
--- a/models/card/src/index.ts
+++ b/models/card/src/index.ts
@@ -43,7 +43,7 @@ import view, { createAction } from '@hcengineering/model-view'
 import workbench from '@hcengineering/model-workbench'
 import { getEmbeddedLabel, type IntlString } from '@hcengineering/platform'
 import time, { type ToDo } from '@hcengineering/time'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import card from './plugin'
 
 export { cardId } from '@hcengineering/card'
diff --git a/models/card/src/plugin.ts b/models/card/src/plugin.ts
index ef1ce2aa73..f8fc7524d4 100644
--- a/models/card/src/plugin.ts
+++ b/models/card/src/plugin.ts
@@ -19,7 +19,7 @@ import type { Client, Doc, Ref } from '@hcengineering/core'
 import {} from '@hcengineering/core'
 import { mergeIds, type Resource } from '@hcengineering/platform'
 import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/model-presentation'
-import { type Location, type ResolvedLocation } from '@hcengineering/ui'
+import { type Location, type ResolvedLocation } from '@hcengineering/ui/src/types'
 import { type LocationData } from '@hcengineering/workbench'
 import { type Action, type ViewAction } from '@hcengineering/view'
 
diff --git a/models/chunter/src/types.ts b/models/chunter/src/types.ts
index 73c7213eec..f4205e5dc3 100644
--- a/models/chunter/src/types.ts
+++ b/models/chunter/src/types.ts
@@ -58,7 +58,7 @@ import type { IntlString, Resource } from '@hcengineering/platform'
 import type { DocNotifyContext } from '@hcengineering/notification'
 
 import chunter from './plugin'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 
 export const DOMAIN_CHUNTER = 'chunter' as Domain
 
diff --git a/models/controlled-documents/src/plugin.ts b/models/controlled-documents/src/plugin.ts
index 8d9c54b779..fdde0039ed 100644
--- a/models/controlled-documents/src/plugin.ts
+++ b/models/controlled-documents/src/plugin.ts
@@ -19,7 +19,7 @@ import type { Client, Doc, Ref } from '@hcengineering/core'
 import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/model-presentation'
 import { mergeIds, type Resource } from '@hcengineering/platform'
 import { type TagCategory } from '@hcengineering/tags'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type ActionCategory, type ViewAction } from '@hcengineering/view'
 import { type NotificationType, type NotificationGroup } from '@hcengineering/notification'
 import { type TextActionVisibleFunction, type TextActionFunction } from '@hcengineering/text-editor'
diff --git a/models/document/src/plugin.ts b/models/document/src/plugin.ts
index e83a4ff7c7..78b3ce3f2d 100644
--- a/models/document/src/plugin.ts
+++ b/models/document/src/plugin.ts
@@ -20,7 +20,7 @@ import document from '@hcengineering/document-resources/src/plugin'
 import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/model-presentation'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
 import { type TagCategory } from '@hcengineering/tags'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import type { Action, ActionCategory, ViewAction, Viewlet } from '@hcengineering/view'
 
 export default mergeIds(documentId, document, {
diff --git a/models/drive/src/plugin.ts b/models/drive/src/plugin.ts
index dc05a8f62e..3f351771c0 100644
--- a/models/drive/src/plugin.ts
+++ b/models/drive/src/plugin.ts
@@ -19,7 +19,7 @@ import { driveId } from '@hcengineering/drive'
 import drive from '@hcengineering/drive-resources/src/plugin'
 import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/model-presentation'
 import { type IntlString, type Resource, mergeIds } from '@hcengineering/platform'
-import { type AnyComponent, type Location } from '@hcengineering/ui'
+import { type AnyComponent, type Location } from '@hcengineering/ui/src/types'
 import {
   type Action,
   type ActionCategory,
diff --git a/models/guest/src/index.ts b/models/guest/src/index.ts
index bf9fe3e495..b0f26b103f 100644
--- a/models/guest/src/index.ts
+++ b/models/guest/src/index.ts
@@ -9,7 +9,7 @@ import {
 import { type PublicLink, type Restrictions, guestAccountEmail } from '@hcengineering/guest'
 import { type Builder, Model } from '@hcengineering/model'
 import core, { TDoc } from '@hcengineering/model-core'
-import { type Location } from '@hcengineering/ui'
+import { type Location } from '@hcengineering/ui/src/types'
 import guest from './plugin'
 
 export const GUEST_DOMAIN = 'guest' as Domain
diff --git a/models/guest/src/plugin.ts b/models/guest/src/plugin.ts
index deff851c67..d1c97d3099 100644
--- a/models/guest/src/plugin.ts
+++ b/models/guest/src/plugin.ts
@@ -2,7 +2,7 @@ import { type Account, type Doc, type Ref } from '@hcengineering/core'
 import { guestId } from '@hcengineering/guest'
 import guest from '@hcengineering/guest-resources/src/plugin'
 import { mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type Action, type ActionCategory } from '@hcengineering/view'
 
 export default mergeIds(guestId, guest, {
diff --git a/models/love/src/plugin.ts b/models/love/src/plugin.ts
index 1829a21dfd..f8819f6ed0 100644
--- a/models/love/src/plugin.ts
+++ b/models/love/src/plugin.ts
@@ -16,7 +16,7 @@
 import { type Client, type Doc, type Ref } from '@hcengineering/core'
 import { type NotificationType, type NotificationGroup } from '@hcengineering/notification'
 import { type Resource, mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type ActionCategory, type ViewAction } from '@hcengineering/view'
 import { loveId } from '@hcengineering/love'
 import love from '@hcengineering/love-resources/src/plugin'
diff --git a/models/presence/src/plugin.ts b/models/presence/src/plugin.ts
index 1cb9b1449d..3c7bd4c46d 100644
--- a/models/presence/src/plugin.ts
+++ b/models/presence/src/plugin.ts
@@ -14,7 +14,7 @@
 //
 
 import { mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { presenceId } from '@hcengineering/presence'
 import presence from '@hcengineering/presence-resources/src/plugin'
 
diff --git a/models/print/src/plugin.ts b/models/print/src/plugin.ts
index 154799ed6d..ae258440d3 100644
--- a/models/print/src/plugin.ts
+++ b/models/print/src/plugin.ts
@@ -16,7 +16,7 @@
 import { type Doc, type Ref } from '@hcengineering/core'
 import { mergeIds } from '@hcengineering/platform'
 import { type ViewAction, type Action } from '@hcengineering/view'
-import { type FilePreviewExtension } from '@hcengineering/presentation'
+import { type FilePreviewExtension } from '@hcengineering/presentation/src/types'
 import { printId } from '@hcengineering/print'
 // This import is needed because of similar import in print plugin
 // Otherwise, TS complains about missing types for resulting merge
diff --git a/models/task/src/index.ts b/models/task/src/index.ts
index 2574086d00..f1cf9eb6f9 100644
--- a/models/task/src/index.ts
+++ b/models/task/src/index.ts
@@ -76,8 +76,8 @@ import {
   type TaskTypeDescriptor,
   type TaskTypeKind
 } from '@hcengineering/task'
-import type { AnyComponent } from '@hcengineering/ui'
 import { PaletteColorIndexes } from '@hcengineering/ui/src/colors'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 
 import task from './plugin'
 
diff --git a/models/text-editor/src/index.ts b/models/text-editor/src/index.ts
index 82557e4dfb..0576c24f58 100644
--- a/models/text-editor/src/index.ts
+++ b/models/text-editor/src/index.ts
@@ -31,7 +31,7 @@ import {
   type TextEditorActionKind
 } from '@hcengineering/text-editor'
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import type { EditorKitOptions } from '@hcengineering/text-editor-resources'
+import type { EditorKitOptions } from '@hcengineering/text-editor-resources/src/kits/editor-kit'
 import textEditor from './plugin'
 
 export { textEditorOperation } from './migration'
diff --git a/models/time/src/index.ts b/models/time/src/index.ts
index 77ad3f89fa..09ed08557b 100644
--- a/models/time/src/index.ts
+++ b/models/time/src/index.ts
@@ -53,7 +53,7 @@ import workbench from '@hcengineering/model-workbench'
 import notification from '@hcengineering/notification'
 import recruit from '@hcengineering/recruit'
 import tags from '@hcengineering/tags'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import {
   type TodoDoneTester,
   timeId,
diff --git a/models/time/src/plugin.ts b/models/time/src/plugin.ts
index 19b134da99..5e799286fc 100644
--- a/models/time/src/plugin.ts
+++ b/models/time/src/plugin.ts
@@ -16,7 +16,7 @@
 import { type Client, type Doc, type Ref } from '@hcengineering/core'
 import { type Application } from '@hcengineering/model-workbench'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 import { type Action, type ActionCategory } from '@hcengineering/view'
 import { timeId } from '@hcengineering/time'
 import time from '@hcengineering/time-resources/src/plugin'
diff --git a/models/training/src/plugin.ts b/models/training/src/plugin.ts
index 2f78c449d9..b75a6c85e6 100644
--- a/models/training/src/plugin.ts
+++ b/models/training/src/plugin.ts
@@ -18,7 +18,7 @@ import { trainingId } from '@hcengineering/training'
 import training from '@hcengineering/training-resources/src/plugin'
 import { mergeIds, type Resource } from '@hcengineering/platform'
 import { type Doc, type Ref } from '@hcengineering/core'
-import { type Location, type ResolvedLocation } from '@hcengineering/ui'
+import { type Location, type ResolvedLocation } from '@hcengineering/ui/src/types'
 import { type Application } from '@hcengineering/workbench'
 import { type ActionCategory } from '@hcengineering/view'
 
diff --git a/models/uploader/src/plugin.ts b/models/uploader/src/plugin.ts
index b9ca3910b3..1f9566018b 100644
--- a/models/uploader/src/plugin.ts
+++ b/models/uploader/src/plugin.ts
@@ -14,7 +14,7 @@
 //
 
 import { mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { uploaderId } from '@hcengineering/uploader'
 import uploader from '@hcengineering/uploader-resources/src/plugin'
 
diff --git a/models/view/src/utils.ts b/models/view/src/utils.ts
index f0c2f599b7..db2a45edbc 100644
--- a/models/view/src/utils.ts
+++ b/models/view/src/utils.ts
@@ -16,7 +16,7 @@
 import { type Class, type Data, type Doc, type Ref } from '@hcengineering/core'
 import { type Builder } from '@hcengineering/model'
 import core from '@hcengineering/model-core'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type Action, type AttributeCategory } from '@hcengineering/view'
 import view from '.'
 
diff --git a/models/workbench/src/index.ts b/models/workbench/src/index.ts
index 96dae1a6f1..880d2547ef 100644
--- a/models/workbench/src/index.ts
+++ b/models/workbench/src/index.ts
@@ -33,7 +33,7 @@ import type {
   SidebarEvent,
   WorkbenchTab
 } from '@hcengineering/workbench'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import core, { TClass, TDoc, TTx } from '@hcengineering/model-core'
 import presentation from '@hcengineering/model-presentation'
 
diff --git a/packages/platform-rig/profiles/assets/tsconfig.json b/packages/platform-rig/profiles/assets/tsconfig.json
index 8e578db9f7..94a2d03e17 100644
--- a/packages/platform-rig/profiles/assets/tsconfig.json
+++ b/packages/platform-rig/profiles/assets/tsconfig.json
@@ -16,6 +16,8 @@
       "dom"
     ],
     "types": ["node", "jest"],
-    "incremental": true
+    "incremental": true,
+    "isolatedModules": true,
+    
   }
 }
\ No newline at end of file
diff --git a/packages/platform-rig/profiles/default/tsconfig.json b/packages/platform-rig/profiles/default/tsconfig.json
index c434de43a6..f6ccee4ce9 100644
--- a/packages/platform-rig/profiles/default/tsconfig.json
+++ b/packages/platform-rig/profiles/default/tsconfig.json
@@ -17,6 +17,7 @@
     "rootDir": "./src",
     "outDir": "./lib",
     "incremental": true,
-    "isolatedModules": true
+    "isolatedModules": true,
+    
   }
 }
\ No newline at end of file
diff --git a/packages/platform-rig/profiles/model/tsconfig.json b/packages/platform-rig/profiles/model/tsconfig.json
index 3a7ae70f1b..1a954bd001 100644
--- a/packages/platform-rig/profiles/model/tsconfig.json
+++ b/packages/platform-rig/profiles/model/tsconfig.json
@@ -13,6 +13,7 @@
     "esModuleInterop": true,
     "incremental": true,
     "types" : [],
-    "isolatedModules": true
+    "isolatedModules": true,
+    
   }
 }
\ No newline at end of file
diff --git a/packages/platform-rig/profiles/node/tsconfig.json b/packages/platform-rig/profiles/node/tsconfig.json
index be325351a1..5430cf1c5a 100644
--- a/packages/platform-rig/profiles/node/tsconfig.json
+++ b/packages/platform-rig/profiles/node/tsconfig.json
@@ -15,6 +15,7 @@
     "rootDir": "./src",
     "outDir": "./lib",
     "incremental": true,
-    "isolatedModules": true
+    "isolatedModules": true,
+    
   }
 }
diff --git a/packages/platform-rig/profiles/package/tsconfig.json b/packages/platform-rig/profiles/package/tsconfig.json
index 6c389326f9..be76b62921 100644
--- a/packages/platform-rig/profiles/package/tsconfig.json
+++ b/packages/platform-rig/profiles/package/tsconfig.json
@@ -15,6 +15,7 @@
     "rootDir": "./src",
     "outDir": "./lib",
     "incremental": true,
-    "isolatedModules": true
+    "isolatedModules": true,
+    
   }
 }
\ No newline at end of file
diff --git a/packages/platform-rig/profiles/ui/tsconfig.json b/packages/platform-rig/profiles/ui/tsconfig.json
index e095e09e86..cea4847109 100644
--- a/packages/platform-rig/profiles/ui/tsconfig.json
+++ b/packages/platform-rig/profiles/ui/tsconfig.json
@@ -18,6 +18,7 @@
     ],
     "incremental": true,
     "types": ["jest"],
-    "isolatedModules": true
+    "isolatedModules": true,
+    
   }
 }
\ No newline at end of file
diff --git a/packages/presentation/src/components/breadcrumbs/types.ts b/packages/presentation/src/components/breadcrumbs/types.ts
index d26b8ff2c5..d3dc40a1c3 100644
--- a/packages/presentation/src/components/breadcrumbs/types.ts
+++ b/packages/presentation/src/components/breadcrumbs/types.ts
@@ -11,7 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { type AnyComponent, type AnySvelteComponent } from '@hcengineering/ui'
+import { type AnyComponent, type AnySvelteComponent } from '@hcengineering/ui/src/types'
 
 interface BreadcrumbsProps {
   readonly color?: number | undefined
diff --git a/packages/presentation/src/plugin.ts b/packages/presentation/src/plugin.ts
index 7737e4a664..e5ec64fb44 100644
--- a/packages/presentation/src/plugin.ts
+++ b/packages/presentation/src/plugin.ts
@@ -32,7 +32,7 @@ import {
 } from '@hcengineering/core'
 import type { Asset, IntlString, Metadata, Plugin, StatusCode } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
-import { type ComponentExtensionId } from '@hcengineering/ui'
+import { type ComponentExtensionId } from '@hcengineering/ui/src/types'
 import { type PresentationMiddlewareFactory } from './pipeline'
 import type { PreviewConfig } from './preview'
 import {
diff --git a/packages/presentation/src/types.ts b/packages/presentation/src/types.ts
index 0dbcd69ac3..a85e6c9afd 100644
--- a/packages/presentation/src/types.ts
+++ b/packages/presentation/src/types.ts
@@ -13,7 +13,7 @@ import {
   type TxOperations
 } from '@hcengineering/core'
 import { type Asset, type IntlString, type Resource } from '@hcengineering/platform'
-import { type AnyComponent, type AnySvelteComponent, type ComponentExtensionId } from '@hcengineering/ui'
+import { type AnyComponent, type AnySvelteComponent, type ComponentExtensionId } from '@hcengineering/ui/src/types'
 
 export * from './components/breadcrumbs/types'
 
diff --git a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
index f6b2ebf556..72c4c39705 100644
--- a/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
+++ b/plugins/attachment-resources/src/components/AttachmentRefInput.svelte
@@ -18,15 +18,15 @@
   import { Asset, IntlString, setPlatformStatus, unknownError } from '@hcengineering/platform'
   import {
     DraftController,
+    canDisplayLinkPreview,
     createQuery,
     deleteFile,
     draftsStore,
+    fetchLinkPreviewDetails,
     getClient,
     getFileMetadata,
-    uploadFile,
-    fetchLinkPreviewDetails,
-    canDisplayLinkPreview,
-    isLinkPreviewEnabled
+    isLinkPreviewEnabled,
+    uploadFile
   } from '@hcengineering/presentation'
   import { EmptyMarkup } from '@hcengineering/text'
   import textEditor, { type RefAction } from '@hcengineering/text-editor'
@@ -35,7 +35,6 @@
   import { createEventDispatcher, onDestroy, tick } from 'svelte'
   import attachment from '../plugin'
   import AttachmentPresenter from './AttachmentPresenter.svelte'
-  import { rmSync } from 'fs'
 
   export let objectId: Ref<Doc>
   export let space: Ref<Space>
diff --git a/plugins/bitrix-resources/src/plugin.ts b/plugins/bitrix-resources/src/plugin.ts
index 35eac13619..e9d48e46e1 100644
--- a/plugins/bitrix-resources/src/plugin.ts
+++ b/plugins/bitrix-resources/src/plugin.ts
@@ -18,7 +18,7 @@ import { type IntlString, mergeIds } from '@hcengineering/platform'
 import bitrix, { bitrixId } from '@hcengineering/bitrix'
 import { type Ref } from '@hcengineering/core'
 import { type Handler, type IntegrationType } from '@hcengineering/setting'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(bitrixId, bitrix, {
   string: {
diff --git a/plugins/board-resources/src/plugin.ts b/plugins/board-resources/src/plugin.ts
index 40fa6ec7f6..7937afe3b5 100644
--- a/plugins/board-resources/src/plugin.ts
+++ b/plugins/board-resources/src/plugin.ts
@@ -16,7 +16,7 @@
 import board, { boardId } from '@hcengineering/board'
 import { type Ref, type StatusCategory } from '@hcengineering/core'
 import { type IntlString, mergeIds } from '@hcengineering/platform'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(boardId, board, {
   string: {
diff --git a/plugins/card-resources/src/plugin.ts b/plugins/card-resources/src/plugin.ts
index b1134284c1..8de66b1f4a 100644
--- a/plugins/card-resources/src/plugin.ts
+++ b/plugins/card-resources/src/plugin.ts
@@ -16,7 +16,7 @@
 import card, { cardId } from '@hcengineering/card'
 import { type Ref } from '@hcengineering/core'
 import { type IntlString, mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type Viewlet } from '@hcengineering/view'
 
 export default mergeIds(cardId, card, {
diff --git a/plugins/chunter-resources/src/plugin.ts b/plugins/chunter-resources/src/plugin.ts
index 5e70cb1c77..d2f93c3bdd 100644
--- a/plugins/chunter-resources/src/plugin.ts
+++ b/plugins/chunter-resources/src/plugin.ts
@@ -17,7 +17,7 @@ import chunter, { chunterId } from '@hcengineering/chunter'
 import type { Client, Doc, Ref, Space } from '@hcengineering/core'
 import type { IntlString, Resource } from '@hcengineering/platform'
 import { mergeIds } from '@hcengineering/platform'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 import { type ViewAction } from '@hcengineering/view'
 import { type DocNotifyContext, type InboxNotification } from '@hcengineering/notification'
 
diff --git a/plugins/contact-resources/src/plugin.ts b/plugins/contact-resources/src/plugin.ts
index b3c630f321..fe38707508 100644
--- a/plugins/contact-resources/src/plugin.ts
+++ b/plugins/contact-resources/src/plugin.ts
@@ -17,7 +17,7 @@
 import contact, { contactId } from '@hcengineering/contact'
 import { type Client, type Doc } from '@hcengineering/core'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
-import { type LabelAndProps, type Location } from '@hcengineering/ui'
+import { type LabelAndProps, type Location } from '@hcengineering/ui/src/types'
 import {
   type CreateAggregationManagerFunc,
   type GrouppingManagerResource,
diff --git a/plugins/controlled-documents-resources/src/plugin.ts b/plugins/controlled-documents-resources/src/plugin.ts
index 9e14aaa0cb..85a569dad6 100644
--- a/plugins/controlled-documents-resources/src/plugin.ts
+++ b/plugins/controlled-documents-resources/src/plugin.ts
@@ -20,7 +20,7 @@ import documents, {
 } from '@hcengineering/controlled-documents'
 import { type Client, type Doc, type Ref, type Space } from '@hcengineering/core'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
-import { type AnyComponent, type Location } from '@hcengineering/ui'
+import { type AnyComponent, type Location } from '@hcengineering/ui/src/types'
 import type { KeyFilter, SortFunc, ViewActionAvailabilityFunction } from '@hcengineering/view'
 
 export default mergeIds(documentsId, documents, {
diff --git a/plugins/controlled-documents/src/plugin.ts b/plugins/controlled-documents/src/plugin.ts
index 28bca7c96d..d4262a15df 100644
--- a/plugins/controlled-documents/src/plugin.ts
+++ b/plugins/controlled-documents/src/plugin.ts
@@ -12,7 +12,7 @@ import {
 } from '@hcengineering/core'
 import type { Asset, Plugin, Resource } from '@hcengineering/platform'
 import { IntlString, plugin } from '@hcengineering/platform'
-import type { AnyComponent, ResolvedLocation, Location } from '@hcengineering/ui'
+import type { AnyComponent, ResolvedLocation, Location } from '@hcengineering/ui/src/types'
 import { Action } from '@hcengineering/view'
 
 import type {
diff --git a/plugins/document-resources/src/plugin.ts b/plugins/document-resources/src/plugin.ts
index 52e193a833..957500ec3a 100644
--- a/plugins/document-resources/src/plugin.ts
+++ b/plugins/document-resources/src/plugin.ts
@@ -16,7 +16,7 @@
 import { type Client, type Doc, type Ref } from '@hcengineering/core'
 import document, { type Document, documentId } from '@hcengineering/document'
 import { mergeIds, type IntlString, type Resource } from '@hcengineering/platform'
-import { type AnyComponent, type Location } from '@hcengineering/ui'
+import { type AnyComponent, type Location } from '@hcengineering/ui/src/types'
 
 export default mergeIds(documentId, document, {
   component: {
diff --git a/plugins/document/src/plugin.ts b/plugins/document/src/plugin.ts
index 2c8fabcb29..7613d355f7 100644
--- a/plugins/document/src/plugin.ts
+++ b/plugins/document/src/plugin.ts
@@ -17,7 +17,7 @@ import type { Class, Doc, Mixin, Ref, SpaceType, SpaceTypeDescriptor } from '@hc
 import { NotificationGroup, NotificationType } from '@hcengineering/notification'
 import type { Asset, Plugin, Resource } from '@hcengineering/platform'
 import { IntlString, plugin } from '@hcengineering/platform'
-import type { AnyComponent, Location, ResolvedLocation } from '@hcengineering/ui'
+import type { AnyComponent, Location, ResolvedLocation } from '@hcengineering/ui/src/types'
 import { Action } from '@hcengineering/view'
 import { Document, DocumentSnapshot, SavedDocument, Teamspace } from './types'
 
diff --git a/plugins/drive/src/plugin.ts b/plugins/drive/src/plugin.ts
index 11c7d89a8b..4d52c95798 100644
--- a/plugins/drive/src/plugin.ts
+++ b/plugins/drive/src/plugin.ts
@@ -16,7 +16,7 @@
 import type { Class, Doc, Mixin, Ref, SpaceType, SpaceTypeDescriptor, Type } from '@hcengineering/core'
 import type { Asset, IntlString, Plugin, Resource as PlatformResource } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
-import type { Location, ResolvedLocation } from '@hcengineering/ui'
+import type { Location, ResolvedLocation } from '@hcengineering/ui/src/types'
 import { Drive, File, FileVersion, Folder, Resource } from './types'
 
 export * from './types'
diff --git a/plugins/lead-resources/src/plugin.ts b/plugins/lead-resources/src/plugin.ts
index 1a2a1c354b..c8f5f879bc 100644
--- a/plugins/lead-resources/src/plugin.ts
+++ b/plugins/lead-resources/src/plugin.ts
@@ -16,7 +16,7 @@
 import lead, { leadId } from '@hcengineering/lead'
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
 import { type Client, type Doc, type Ref } from '@hcengineering/core'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(leadId, lead, {
   string: {
diff --git a/plugins/love-resources/src/plugin.ts b/plugins/love-resources/src/plugin.ts
index e2fef3a06c..699e784653 100644
--- a/plugins/love-resources/src/plugin.ts
+++ b/plugins/love-resources/src/plugin.ts
@@ -15,8 +15,8 @@
 
 import love, { loveId } from '@hcengineering/love'
 import { mergeIds, type IntlString, type Resource } from '@hcengineering/platform'
-import { type DocCreateFunction } from '@hcengineering/presentation'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type DocCreateFunction } from '@hcengineering/presentation/src/types'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type ViewActionAvailabilityFunction } from '@hcengineering/view'
 
 export default mergeIds(loveId, love, {
diff --git a/plugins/presence/src/plugin.ts b/plugins/presence/src/plugin.ts
index 7f50ca851a..c6cb101e4a 100644
--- a/plugins/presence/src/plugin.ts
+++ b/plugins/presence/src/plugin.ts
@@ -15,7 +15,7 @@
 
 import type { Metadata, Plugin } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
-import { AnyComponent } from '@hcengineering/ui'
+import { AnyComponent } from '@hcengineering/ui/src/types'
 
 /** @public */
 export const presenceId = 'presence' as Plugin
diff --git a/plugins/print/src/plugin.ts b/plugins/print/src/plugin.ts
index 967bb31660..24b758bb8c 100644
--- a/plugins/print/src/plugin.ts
+++ b/plugins/print/src/plugin.ts
@@ -4,7 +4,7 @@
 
 import { type Doc } from '@hcengineering/core'
 import { type IntlString, type Metadata, type Plugin, plugin, type Asset, type Resource } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export const printId = 'print' as Plugin
 
diff --git a/plugins/products-resources/src/plugin.ts b/plugins/products-resources/src/plugin.ts
index 285cd9ae10..b36cc84d16 100644
--- a/plugins/products-resources/src/plugin.ts
+++ b/plugins/products-resources/src/plugin.ts
@@ -16,8 +16,8 @@
 import products, { productsId } from '@hcengineering/products'
 import { type Ref, type Space } from '@hcengineering/core'
 import { type IntlString, type Resource, mergeIds } from '@hcengineering/platform'
-import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/presentation'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/presentation/src/types'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type KeyFilter } from '@hcengineering/view'
 
 export default mergeIds(productsId, products, {
diff --git a/plugins/products/src/plugin.ts b/plugins/products/src/plugin.ts
index 078115f123..d92d8110fa 100644
--- a/plugins/products/src/plugin.ts
+++ b/plugins/products/src/plugin.ts
@@ -17,7 +17,7 @@ import { Mixin, Type, type Class, type Doc, type Ref } from '@hcengineering/core
 import type { Asset, IntlString, Plugin } from '@hcengineering/platform'
 
 import { plugin } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { ActionCategory, Viewlet } from '@hcengineering/view'
 import type { DocumentSpaceType, DocumentSpaceTypeDescriptor } from '@hcengineering/controlled-documents'
 import { Product, ProductVersion, ProductVersionState } from './types'
diff --git a/plugins/recruit-resources/src/components/CreateCandidate.svelte b/plugins/recruit-resources/src/components/CreateCandidate.svelte
index 9767c92bf5..0c63a0fde8 100644
--- a/plugins/recruit-resources/src/components/CreateCandidate.svelte
+++ b/plugins/recruit-resources/src/components/CreateCandidate.svelte
@@ -74,7 +74,6 @@
   import recruit from '../plugin'
   import { getCandidateIdentifier } from '../utils'
   import YesNo from './YesNo.svelte'
-  import IconSwitch from './icons/Switch.svelte'
   import IconShuffle from './icons/Shuffle.svelte'
 
   export let shouldSaveDraft: boolean = true
diff --git a/plugins/recruit-resources/src/plugin.ts b/plugins/recruit-resources/src/plugin.ts
index a22e2b7c0d..f5a771c283 100644
--- a/plugins/recruit-resources/src/plugin.ts
+++ b/plugins/recruit-resources/src/plugin.ts
@@ -16,10 +16,10 @@
 import { type Client, type Doc, type Ref } from '@hcengineering/core'
 import type { IntlString, Resource, StatusCode } from '@hcengineering/platform'
 import { mergeIds } from '@hcengineering/platform'
-import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/presentation'
+import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/presentation/src/types'
 import recruit, { recruitId } from '@hcengineering/recruit'
 import { type TagCategory } from '@hcengineering/tags'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type FilterFunction, type FilterMode, type Viewlet } from '@hcengineering/view'
 
 export default mergeIds(recruitId, recruit, {
diff --git a/plugins/setting-resources/src/plugin.ts b/plugins/setting-resources/src/plugin.ts
index 03b12565d7..10e523c4c4 100644
--- a/plugins/setting-resources/src/plugin.ts
+++ b/plugins/setting-resources/src/plugin.ts
@@ -17,7 +17,7 @@ import { type Ref } from '@hcengineering/core'
 import type { IntlString } from '@hcengineering/platform'
 import { mergeIds } from '@hcengineering/platform'
 import setting, { settingId } from '@hcengineering/setting'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type Widget } from '@hcengineering/workbench'
 
 export default mergeIds(settingId, setting, {
diff --git a/plugins/survey-resources/src/plugin.ts b/plugins/survey-resources/src/plugin.ts
index 163ecbac44..5ce97071b8 100644
--- a/plugins/survey-resources/src/plugin.ts
+++ b/plugins/survey-resources/src/plugin.ts
@@ -16,7 +16,7 @@
 import type { Client, Doc, Ref } from '@hcengineering/core'
 import { type Resource, mergeIds } from '@hcengineering/platform'
 import survey, { surveyId } from '@hcengineering/survey'
-import type { Location, ResolvedLocation } from '@hcengineering/ui'
+import type { Location, ResolvedLocation } from '@hcengineering/ui/src/types'
 import type { Action, ActionCategory, ViewAction } from '@hcengineering/view'
 
 export default mergeIds(surveyId, survey, {
diff --git a/plugins/tags-resources/src/plugin.ts b/plugins/tags-resources/src/plugin.ts
index dbcfccf147..6db1a5bda9 100644
--- a/plugins/tags-resources/src/plugin.ts
+++ b/plugins/tags-resources/src/plugin.ts
@@ -13,7 +13,7 @@
 
 import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform'
 import tags, { tagsId } from '@hcengineering/tags'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import { type FilterFunction } from '@hcengineering/view'
 
 export default mergeIds(tagsId, tags, {
diff --git a/plugins/telegram-resources/src/plugin.ts b/plugins/telegram-resources/src/plugin.ts
index 1765a3cd1b..4d753f46d2 100644
--- a/plugins/telegram-resources/src/plugin.ts
+++ b/plugins/telegram-resources/src/plugin.ts
@@ -17,7 +17,7 @@
 import { type IntlString, mergeIds } from '@hcengineering/platform'
 
 import telegram, { telegramId } from '@hcengineering/telegram'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(telegramId, telegram, {
   string: {
diff --git a/plugins/templates-resources/src/plugin.ts b/plugins/templates-resources/src/plugin.ts
index 9c6c238642..504ff63eab 100644
--- a/plugins/templates-resources/src/plugin.ts
+++ b/plugins/templates-resources/src/plugin.ts
@@ -15,7 +15,7 @@
 //
 
 import { type IntlString, mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import templates, { templatesId } from '@hcengineering/templates'
 
 export default mergeIds(templatesId, templates, {
diff --git a/plugins/templates/src/index.ts b/plugins/templates/src/index.ts
index c3c22c8dd5..4a2e751177 100644
--- a/plugins/templates/src/index.ts
+++ b/plugins/templates/src/index.ts
@@ -14,9 +14,9 @@
 //
 
 import type { Class, Doc, Markup, Ref, Space } from '@hcengineering/core'
-import type { IntlString, Plugin, Resource } from '@hcengineering/platform'
-import { Asset, plugin } from '@hcengineering/platform'
-import { AnyComponent } from '@hcengineering/ui'
+import type { IntlString, Plugin, Resource, Asset } from '@hcengineering/platform'
+import { plugin } from '@hcengineering/platform'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 /**
  * @public
diff --git a/plugins/test-management/src/plugin.ts b/plugins/test-management/src/plugin.ts
index 0074c5fe76..d306c4279e 100644
--- a/plugins/test-management/src/plugin.ts
+++ b/plugins/test-management/src/plugin.ts
@@ -26,7 +26,7 @@ import {
 import type { Asset, IntlString, Plugin, Resource } from '@hcengineering/platform'
 
 import { plugin } from '@hcengineering/platform'
-import { type AnyComponent, type Location, type ResolvedLocation } from '@hcengineering/ui'
+import { type AnyComponent, type Location, type ResolvedLocation } from '@hcengineering/ui/src/types'
 
 import { Action, ActionCategory, ViewAction, Viewlet } from '@hcengineering/view'
 import {
diff --git a/plugins/tracker-resources/src/plugin.ts b/plugins/tracker-resources/src/plugin.ts
index 35c2619bde..6768e87652 100644
--- a/plugins/tracker-resources/src/plugin.ts
+++ b/plugins/tracker-resources/src/plugin.ts
@@ -15,10 +15,10 @@
 import { type StatusCategory, type Client, type Doc, type Ref, type Space } from '@hcengineering/core'
 import type { Asset, IntlString, Metadata, Resource } from '@hcengineering/platform'
 import { mergeIds } from '@hcengineering/platform'
-import type { ObjectSearchCategory, ObjectSearchFactory } from '@hcengineering/presentation'
+import type { ObjectSearchCategory, ObjectSearchFactory } from '@hcengineering/presentation/src/types'
 import { type ProjectType, type TaskType } from '@hcengineering/task'
 import tracker, { trackerId, type IssueDraft, type Issue } from '@hcengineering/tracker'
-import { type AnyComponent, type Location } from '@hcengineering/ui'
+import { type AnyComponent, type Location } from '@hcengineering/ui/src/types'
 import {
   type CreateAggregationManagerFunc,
   type GetAllValuesFunc,
diff --git a/plugins/uploader-resources/src/plugin.ts b/plugins/uploader-resources/src/plugin.ts
index efbb5f2684..eedc77772c 100644
--- a/plugins/uploader-resources/src/plugin.ts
+++ b/plugins/uploader-resources/src/plugin.ts
@@ -14,7 +14,7 @@
 //
 
 import { type IntlString, mergeIds } from '@hcengineering/platform'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import uploader, { uploaderId } from '@hcengineering/uploader'
 
 export default mergeIds(uploaderId, uploader, {
diff --git a/plugins/uploader/src/plugin.ts b/plugins/uploader/src/plugin.ts
index 1ce8991cbe..6c6c4cfcfc 100644
--- a/plugins/uploader/src/plugin.ts
+++ b/plugins/uploader/src/plugin.ts
@@ -15,7 +15,7 @@
 
 import type { IntlString, Plugin, Resource } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 
 import type { UploadFilesFn, UploadFilesPopupFn } from './types'
 
diff --git a/plugins/view-resources/src/plugin.ts b/plugins/view-resources/src/plugin.ts
index 8e33a660d6..bdac738f4a 100644
--- a/plugins/view-resources/src/plugin.ts
+++ b/plugins/view-resources/src/plugin.ts
@@ -15,8 +15,8 @@
 //
 
 import { type IntlString, type Resource, mergeIds } from '@hcengineering/platform'
-import { type PresentationMiddlewareCreator } from '@hcengineering/presentation'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type PresentationMiddlewareCreator } from '@hcengineering/presentation/src/pipeline'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 import view, { viewId } from '@hcengineering/view'
 
 export default mergeIds(viewId, view, {
diff --git a/plugins/view/src/index.ts b/plugins/view/src/index.ts
index 7a163484a9..5cee522138 100644
--- a/plugins/view/src/index.ts
+++ b/plugins/view/src/index.ts
@@ -16,7 +16,7 @@
 
 import { Class, Doc, DocumentQuery, FindOptions, Mixin, Ref } from '@hcengineering/core'
 import { Asset, IntlString, Plugin, Resource, plugin } from '@hcengineering/platform'
-import { AnyComponent, PopupAlignment, PopupPosAlignment } from '@hcengineering/ui'
+import { AnyComponent, PopupAlignment, PopupPosAlignment } from '@hcengineering/ui/src/types'
 import {
   Action,
   ActionCategory,
diff --git a/plugins/workbench-resources/src/components/Navigator.svelte b/plugins/workbench-resources/src/components/Navigator.svelte
index 0dbeadb02b..e121facb86 100644
--- a/plugins/workbench-resources/src/components/Navigator.svelte
+++ b/plugins/workbench-resources/src/components/Navigator.svelte
@@ -47,7 +47,7 @@
       (it) => !hierarchy.isMixin(it)
     )
     if (classes.length > 0) {
-      query.query(
+      query.query<Space>(
         classes.length === 1 ? classes[0] : core.class.Space,
         !adminUser
           ? {
diff --git a/plugins/workbench-resources/src/plugin.ts b/plugins/workbench-resources/src/plugin.ts
index 6e7593a338..2024032f0c 100644
--- a/plugins/workbench-resources/src/plugin.ts
+++ b/plugins/workbench-resources/src/plugin.ts
@@ -17,7 +17,7 @@ import { mergeIds } from '@hcengineering/platform'
 import type { IntlString, Metadata } from '@hcengineering/platform'
 
 import workbench, { workbenchId } from '@hcengineering/workbench'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(workbenchId, workbench, {
   string: {
diff --git a/plugins/workbench-resources/src/utils.ts b/plugins/workbench-resources/src/utils.ts
index c36a0d9dc1..b95905cba7 100644
--- a/plugins/workbench-resources/src/utils.ts
+++ b/plugins/workbench-resources/src/utils.ts
@@ -19,16 +19,15 @@ import core, { hasAccountRole } from '@hcengineering/core'
 import type { Workspace } from '@hcengineering/login'
 import login, { loginId } from '@hcengineering/login'
 import { getResource, setMetadata } from '@hcengineering/platform'
-import { closeClient, getClient } from '@hcengineering/presentation'
-import presentation from '@hcengineering/presentation/src/plugin'
+import presentation, { closeClient, getClient } from '@hcengineering/presentation'
 import {
   closePanel,
   fetchMetadataLocalStorage,
   getCurrentLocation,
   type Location,
+  location,
   navigate,
-  setMetadataLocalStorage,
-  location
+  setMetadataLocalStorage
 } from '@hcengineering/ui'
 import view from '@hcengineering/view'
 import workbench, { type Application, type NavigatorModel } from '@hcengineering/workbench'
diff --git a/rush.json b/rush.json
index f8bebe78d7..0b771f87ab 100644
--- a/rush.json
+++ b/rush.json
@@ -16,7 +16,7 @@
    * path segment in the "$schema" field for all your Rush config files.  This will ensure
    * correct error-underlining and tab-completion for editors such as VS Code.
    */
-  "rushVersion": "5.148.0",
+  "rushVersion": "5.149.0",
 
   /**
    * The next field selects which package manager should be installed and determines its version.
@@ -124,7 +124,7 @@
    * LTS schedule: https://nodejs.org/en/about/releases/
    * LTS versions: https://nodejs.org/en/download/releases/
    */
-  "nodeSupportedVersionRange": ">=12.13.0 <13.0.0 || >=14.15.0 <15.0.0 || >=16.0.0",
+  "nodeSupportedVersionRange": ">=20.0.0 <23.0.0",
 
   /**
    * Odd-numbered major versions of Node.js are experimental.  Even-numbered releases
diff --git a/server/account/src/operations.ts b/server/account/src/operations.ts
index 5c36039320..c265fac33f 100644
--- a/server/account/src/operations.ts
+++ b/server/account/src/operations.ts
@@ -1237,6 +1237,7 @@ export async function updateWorkspaceInfo (
     case 'restore-done':
       update.mode = 'active'
       update.progress = 100
+      update.lastProcessingTime = Date.now() - processingTimeoutMs // To not wait for next step
       break
 
     case 'archiving-backup-started':
diff --git a/services/github/github-resources/src/plugin.ts b/services/github/github-resources/src/plugin.ts
index d146ffdc40..c14e5ccefd 100644
--- a/services/github/github-resources/src/plugin.ts
+++ b/services/github/github-resources/src/plugin.ts
@@ -7,7 +7,7 @@ import { type IntlString, mergeIds } from '@hcengineering/platform'
 import github, { githubId } from '@hcengineering/github'
 import { type Ref } from '@hcengineering/core'
 import { type Handler, type IntegrationType } from '@hcengineering/setting'
-import { type AnyComponent } from '@hcengineering/ui'
+import { type AnyComponent } from '@hcengineering/ui/src/types'
 
 export default mergeIds(githubId, github, {
   string: {
diff --git a/services/github/model-github/src/plugin.ts b/services/github/model-github/src/plugin.ts
index 40768235b5..985a758441 100644
--- a/services/github/model-github/src/plugin.ts
+++ b/services/github/model-github/src/plugin.ts
@@ -14,7 +14,7 @@ import {
   type DocCreateAnalyticsPropsFunction
 } from '@hcengineering/model-presentation'
 import { type NotificationGroup } from '@hcengineering/notification'
-import type { AnyComponent } from '@hcengineering/ui'
+import type { AnyComponent } from '@hcengineering/ui/src/types'
 import { type ActionCategory, type Viewlet } from '@hcengineering/view'
 
 export default mergeIds(githubId, github, {