diff --git a/models/activity/src/index.ts b/models/activity/src/index.ts index fda540760d..1017261eb9 100644 --- a/models/activity/src/index.ts +++ b/models/activity/src/index.ts @@ -25,7 +25,7 @@ import core, { DOMAIN_MODEL, type Class, type Doc, type DocumentQuery, type Ref, import { Mixin, Model, type Builder } from '@hcengineering/model' import { TClass, TDoc } from '@hcengineering/model-core' import type { Asset, IntlString, Resource } from '@hcengineering/platform' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import activity from './plugin' diff --git a/models/attachment/src/plugin.ts b/models/attachment/src/plugin.ts index 7995332afe..0958be8a12 100644 --- a/models/attachment/src/plugin.ts +++ b/models/attachment/src/plugin.ts @@ -19,7 +19,7 @@ import attachment from '@hcengineering/attachment-resources/src/plugin' import type { Ref, Doc } 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 { ActionCategory } from '@hcengineering/view' export default mergeIds(attachmentId, attachment, { diff --git a/models/bitrix/src/plugin.ts b/models/bitrix/src/plugin.ts index 4b399f8dec..27eb2d9d04 100644 --- a/models/bitrix/src/plugin.ts +++ b/models/bitrix/src/plugin.ts @@ -20,7 +20,7 @@ import { type IntlString, mergeIds } from '@hcengineering/platform' import { type Action } from '@hcengineering/view' import { type Ref } from '@hcengineering/core' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' export default mergeIds(bitrixId, bitrix, { component: { diff --git a/models/board/src/index.ts b/models/board/src/index.ts index 45ab6d987a..fc711f3c11 100644 --- a/models/board/src/index.ts +++ b/models/board/src/index.ts @@ -53,7 +53,7 @@ import task, { actionTemplates as taskActionTemplates, TProject, TTask } from '@ import view, { actionTemplates, createAction, actionTemplates as viewTemplates } from '@hcengineering/model-view' import workbench, { type Application } from '@hcengineering/model-workbench' import { type IntlString } from '@hcengineering/platform' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' import board from './plugin' export { boardId } from '@hcengineering/board' diff --git a/models/board/src/migration.ts b/models/board/src/migration.ts index 24b19fb204..1e8442941f 100644 --- a/models/board/src/migration.ts +++ b/models/board/src/migration.ts @@ -22,7 +22,7 @@ import { } from '@hcengineering/model' import core from '@hcengineering/model-core' import { createProjectType, createSequence } from '@hcengineering/model-task' -import tags from '@hcengineering/tags' +import tags from '@hcengineering/model-tags' import task, { type ProjectType } from '@hcengineering/task' import board from './plugin' import { PaletteColorIndexes } from '@hcengineering/ui/src/colors' diff --git a/models/board/src/plugin.ts b/models/board/src/plugin.ts index 22f9e15145..0a54d05957 100644 --- a/models/board/src/plugin.ts +++ b/models/board/src/plugin.ts @@ -19,7 +19,7 @@ import board from '@hcengineering/board-resources/src/plugin' import type { Ref } from '@hcengineering/core' import { type IntlString, mergeIds } from '@hcengineering/platform' import { type ProjectType, type Sequence } from '@hcengineering/task' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' import { type Action, type ViewAction, type Viewlet, type ViewletDescriptor } from '@hcengineering/view' export default mergeIds(boardId, board, { diff --git a/models/calendar/src/index.ts b/models/calendar/src/index.ts index 8faeec1ebe..2d5809e048 100644 --- a/models/calendar/src/index.ts +++ b/models/calendar/src/index.ts @@ -50,7 +50,7 @@ import { TProject } from '@hcengineering/model-task' import view, { createAction } from '@hcengineering/model-view' import notification from '@hcengineering/notification' import setting from '@hcengineering/setting' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import calendar from './plugin' export * from '@hcengineering/calendar' diff --git a/models/calendar/src/plugin.ts b/models/calendar/src/plugin.ts index e8e6a4d628..ba7cfd3623 100644 --- a/models/calendar/src/plugin.ts +++ b/models/calendar/src/plugin.ts @@ -20,7 +20,7 @@ import { type Ref } from '@hcengineering/core' import { type NotificationGroup } from '@hcengineering/notification' import type { IntlString } from '@hcengineering/platform' import { mergeIds } from '@hcengineering/platform' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import { type Action, type ActionCategory, diff --git a/models/chunter/src/index.ts b/models/chunter/src/index.ts index 0bee8c31df..2cb8cc412e 100644 --- a/models/chunter/src/index.ts +++ b/models/chunter/src/index.ts @@ -54,7 +54,7 @@ import preference, { TPreference } from '@hcengineering/model-preference' import view, { createAction, actionTemplates as viewTemplates } from '@hcengineering/model-view' import workbench from '@hcengineering/model-workbench' import chunter from './plugin' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' export { chunterId } from '@hcengineering/chunter' export { chunterOperation } from './migration' diff --git a/models/chunter/src/plugin.ts b/models/chunter/src/plugin.ts index 482436957b..65748b3860 100644 --- a/models/chunter/src/plugin.ts +++ b/models/chunter/src/plugin.ts @@ -20,7 +20,7 @@ import type { Doc, Ref, Space } from '@hcengineering/core' import { type NotificationGroup } from '@hcengineering/notification' import type { IntlString, Resource } from '@hcengineering/platform' import { mergeIds } from '@hcengineering/platform' -import type { AnyComponent, Location } from '@hcengineering/ui' +import type { AnyComponent, Location } from '@hcengineering/ui/src/types' import type { Action, ActionCategory, ViewAction, ViewletDescriptor } from '@hcengineering/view' export default mergeIds(chunterId, chunter, { diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts index 271e7576a1..99d6bf393b 100644 --- a/models/contact/src/index.ts +++ b/models/contact/src/index.ts @@ -70,7 +70,7 @@ import notification from '@hcengineering/notification' import type { Asset, IntlString, Resource } from '@hcengineering/platform' import setting from '@hcengineering/setting' import templates from '@hcengineering/templates' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import contact from './plugin' export { contactId } from '@hcengineering/contact' diff --git a/models/contact/src/plugin.ts b/models/contact/src/plugin.ts index ced9f91e31..022e2cb2a1 100644 --- a/models/contact/src/plugin.ts +++ b/models/contact/src/plugin.ts @@ -22,7 +22,7 @@ import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineer import { type NotificationGroup } from '@hcengineering/notification' import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform' import { type TemplateFieldFunc } from '@hcengineering/templates' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' import { type Action, type ActionCategory, type ViewAction } from '@hcengineering/view' import { type ActivityExtension } from '@hcengineering/activity' diff --git a/models/gmail/src/plugin.ts b/models/gmail/src/plugin.ts index f28bc427a7..cc31f25a2d 100644 --- a/models/gmail/src/plugin.ts +++ b/models/gmail/src/plugin.ts @@ -18,7 +18,7 @@ import { type Doc, type Ref } from '@hcengineering/core' import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform' import { gmailId } from '@hcengineering/gmail' import gmail from '@hcengineering/gmail-resources/src/plugin' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' import type { TxViewlet } from '@hcengineering/activity' import { type Action } from '@hcengineering/view' import { type NotificationGroup } from '@hcengineering/notification' diff --git a/models/hr/src/plugin.ts b/models/hr/src/plugin.ts index e6e2fdcfd9..0710d904b8 100644 --- a/models/hr/src/plugin.ts +++ b/models/hr/src/plugin.ts @@ -18,7 +18,7 @@ import { hrId } from '@hcengineering/hr' import hr from '@hcengineering/hr-resources/src/plugin' import { type NotificationGroup } from '@hcengineering/notification' import { type IntlString, mergeIds } from '@hcengineering/platform' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import { type Action, type ActionCategory, type ViewAction } from '@hcengineering/view' export default mergeIds(hrId, hr, { diff --git a/models/inventory/src/plugin.ts b/models/inventory/src/plugin.ts index 3b38b60d9c..1e071fc890 100644 --- a/models/inventory/src/plugin.ts +++ b/models/inventory/src/plugin.ts @@ -18,7 +18,7 @@ import type { Ref } from '@hcengineering/core' import { inventoryId } from '@hcengineering/inventory' import inventory from '@hcengineering/inventory-resources/src/plugin' import { type IntlString, mergeIds } from '@hcengineering/platform' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' import { type Action, type ActionCategory, type ViewAction, type Viewlet } from '@hcengineering/view' import { type ActivityExtension } from '@hcengineering/activity' diff --git a/models/lead/src/plugin.ts b/models/lead/src/plugin.ts index 99b87a3a8b..0e989a3ee6 100644 --- a/models/lead/src/plugin.ts +++ b/models/lead/src/plugin.ts @@ -21,7 +21,7 @@ import { type NotificationGroup, type NotificationType } from '@hcengineering/no import type { IntlString } from '@hcengineering/platform' import { mergeIds } from '@hcengineering/platform' import { type ProjectType } from '@hcengineering/task' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' import { type Action, type ActionCategory, type Viewlet } from '@hcengineering/view' import { type ActivityExtension } from '@hcengineering/activity' diff --git a/models/notification/src/index.ts b/models/notification/src/index.ts index 08aa246b0e..a7fb02e535 100644 --- a/models/notification/src/index.ts +++ b/models/notification/src/index.ts @@ -55,7 +55,7 @@ import { } from '@hcengineering/notification' import type { Asset, IntlString } from '@hcengineering/platform' import setting from '@hcengineering/setting' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import notification from './plugin' export { notificationId } from '@hcengineering/notification' export { notificationOperation } from './migration' diff --git a/models/notification/src/plugin.ts b/models/notification/src/plugin.ts index f26f00eb3b..a84b0d821a 100644 --- a/models/notification/src/plugin.ts +++ b/models/notification/src/plugin.ts @@ -17,7 +17,7 @@ import { type Doc, type Ref } from '@hcengineering/core' import notification, { notificationId } from '@hcengineering/notification' import { type IntlString, type Resource, mergeIds } from '@hcengineering/platform' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import { type Action, type ActionCategory, type ViewAction } from '@hcengineering/view' import { type Application } from '@hcengineering/workbench' import { type TxViewlet } from '@hcengineering/activity' diff --git a/models/presentation/src/index.ts b/models/presentation/src/index.ts index 41d92b3bff..5c37ac1ef2 100644 --- a/models/presentation/src/index.ts +++ b/models/presentation/src/index.ts @@ -18,7 +18,10 @@ import { type Builder, Model, Prop, TypeRef } from '@hcengineering/model' import core, { TDoc } from '@hcengineering/model-core' import { type Asset, type IntlString, type Resource } from '@hcengineering/platform' // Import types to prevent .svelte components to being exposed to type typescript. -import { type PresentationMiddlewareCreator, type PresentationMiddlewareFactory } from '@hcengineering/presentation' +import { + type PresentationMiddlewareCreator, + type PresentationMiddlewareFactory +} from '@hcengineering/presentation/src/pipeline' import { type ComponentPointExtension, type CreateExtensionKind, @@ -30,7 +33,7 @@ import { type ObjectSearchCategory, type ObjectSearchFactory } from '@hcengineering/presentation/src/types' -import { type AnyComponent, type ComponentExtensionId } from '@hcengineering/ui' +import { type AnyComponent, type ComponentExtensionId } from '@hcengineering/ui/src/types' import presentation from './plugin' export { presentationId } from '@hcengineering/presentation/src/plugin' diff --git a/models/recruit/src/plugin.ts b/models/recruit/src/plugin.ts index 1686621cb9..96f9f529ea 100644 --- a/models/recruit/src/plugin.ts +++ b/models/recruit/src/plugin.ts @@ -20,7 +20,7 @@ import { mergeIds } from '@hcengineering/platform' import { recruitId } from '@hcengineering/recruit' import recruit from '@hcengineering/recruit-resources/src/plugin' import { type ProjectType } from '@hcengineering/task' -import type { AnyComponent, Location } from '@hcengineering/ui' +import type { AnyComponent, Location } from '@hcengineering/ui/src/types' import type { Action, ActionCategory, ViewAction, ViewQueryAction, Viewlet } from '@hcengineering/view' import { type ActivityExtension } from '@hcengineering/activity' diff --git a/models/request/src/index.ts b/models/request/src/index.ts index 5e6b29d5d8..49850932c5 100644 --- a/models/request/src/index.ts +++ b/models/request/src/index.ts @@ -42,7 +42,7 @@ import { type RequestPresenter, type RequestStatus } from '@hcengineering/request' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import request from './plugin' export { requestId } from '@hcengineering/request' diff --git a/models/request/src/plugin.ts b/models/request/src/plugin.ts index e1a4419444..002ab08997 100644 --- a/models/request/src/plugin.ts +++ b/models/request/src/plugin.ts @@ -18,7 +18,7 @@ import type { IntlString } from '@hcengineering/platform' import { mergeIds } from '@hcengineering/platform' import { requestId } from '@hcengineering/request' import request from '@hcengineering/request-resources/src/plugin' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import type { TxViewlet } from '@hcengineering/activity' import type { NotificationGroup, NotificationType } from '@hcengineering/notification' diff --git a/models/setting/src/index.ts b/models/setting/src/index.ts index 6bec94ebc2..0721362498 100644 --- a/models/setting/src/index.ts +++ b/models/setting/src/index.ts @@ -36,7 +36,7 @@ import templates from '@hcengineering/templates' import setting from './plugin' import workbench from '@hcengineering/model-workbench' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' export { settingId } from '@hcengineering/setting' export { default } from './plugin' diff --git a/models/setting/src/plugin.ts b/models/setting/src/plugin.ts index 9900560a82..ef2830c504 100644 --- a/models/setting/src/plugin.ts +++ b/models/setting/src/plugin.ts @@ -18,7 +18,7 @@ import { type Doc, type Ref } from '@hcengineering/core' import { type IntlString, mergeIds, type Resource } from '@hcengineering/platform' import { settingId } from '@hcengineering/setting' import setting from '@hcengineering/setting-resources/src/plugin' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import { type Action, type ActionCategory, type ViewAction } from '@hcengineering/view' import { type TemplateFieldFunc } from '@hcengineering/templates' import { type NotificationGroup, type NotificationType } from '@hcengineering/notification' diff --git a/models/tags/src/plugin.ts b/models/tags/src/plugin.ts index 11f7b31c94..9c5d7e65ef 100644 --- a/models/tags/src/plugin.ts +++ b/models/tags/src/plugin.ts @@ -16,7 +16,7 @@ import { type Ref } from '@hcengineering/core' import { type IntlString, mergeIds } from '@hcengineering/platform' import { type TagCategory, tagsId } from '@hcengineering/tags' import tags from '@hcengineering/tags-resources/src/plugin' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' import { type ViewAction } from '@hcengineering/model-view' // eslint-disable-next-line @typescript-eslint/no-unused-vars import view from '@hcengineering/view' diff --git a/models/task/src/index.ts b/models/task/src/index.ts index 08801d3d32..9c071ca8a6 100644 --- a/models/task/src/index.ts +++ b/models/task/src/index.ts @@ -58,7 +58,7 @@ import { type Task, type TodoItem } from '@hcengineering/task' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' import { type ViewAction } from '@hcengineering/view' import task from './plugin' diff --git a/models/task/src/plugin.ts b/models/task/src/plugin.ts index 733e2247af..8c3171f0ff 100644 --- a/models/task/src/plugin.ts +++ b/models/task/src/plugin.ts @@ -19,7 +19,7 @@ import { mergeIds } from '@hcengineering/platform' import { type TagCategory } from '@hcengineering/tags' import { taskId } from '@hcengineering/task' import task from '@hcengineering/task-resources/src/plugin' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' import type { Action, ActionCategory, ViewAction, Viewlet } from '@hcengineering/view' import {} from '@hcengineering/notification' diff --git a/models/telegram/src/plugin.ts b/models/telegram/src/plugin.ts index 6249c8faa8..aba4b290d0 100644 --- a/models/telegram/src/plugin.ts +++ b/models/telegram/src/plugin.ts @@ -18,7 +18,7 @@ import { type Ref } from '@hcengineering/core' import { type IntlString, type Resource, mergeIds } from '@hcengineering/platform' import { telegramId } from '@hcengineering/telegram' import telegram from '@hcengineering/telegram-resources/src/plugin' -import type { AnyComponent } from '@hcengineering/ui' +import type { AnyComponent } from '@hcengineering/ui/src/types' import type { TxViewlet } from '@hcengineering/activity' import { type TemplateFieldFunc } from '@hcengineering/templates' import { type NotificationGroup } from '@hcengineering/notification' diff --git a/models/templates/src/plugin.ts b/models/templates/src/plugin.ts index 46e6e07137..b9e0035635 100644 --- a/models/templates/src/plugin.ts +++ b/models/templates/src/plugin.ts @@ -21,7 +21,7 @@ import { templatesId } from '@hcengineering/templates' import templates from '@hcengineering/templates-resources/src/plugin' import { type RefInputAction, type RefInputActionItem } from '@hcengineering/model-text-editor' -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(templatesId, templates, { diff --git a/models/view/src/index.ts b/models/view/src/index.ts index eb89bd12f3..162d1200e5 100644 --- a/models/view/src/index.ts +++ b/models/view/src/index.ts @@ -30,7 +30,7 @@ import core, { TClass, TDoc } from '@hcengineering/model-core' import preference, { TPreference } from '@hcengineering/model-preference' import presentation from '@hcengineering/model-presentation' import { type Asset, type IntlString, type Resource, type Status } 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/view/src/plugin.ts b/models/view/src/plugin.ts index b767882201..1588df2b7d 100644 --- a/models/view/src/plugin.ts +++ b/models/view/src/plugin.ts @@ -15,9 +15,9 @@ 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 FilterFunction, type ViewAction, type ViewCategoryAction, viewId } from '@hcengineering/view' -import { type PresentationMiddlewareFactory } from '@hcengineering/presentation' +import { type PresentationMiddlewareFactory } from '@hcengineering/presentation/src/pipeline' import view from '@hcengineering/view-resources/src/plugin' export default mergeIds(viewId, view, { diff --git a/models/workbench/src/plugin.ts b/models/workbench/src/plugin.ts index 1684928b3c..fd44116871 100644 --- a/models/workbench/src/plugin.ts +++ b/models/workbench/src/plugin.ts @@ -15,7 +15,7 @@ import { type Doc, type Space } from '@hcengineering/core' import { type IntlString, type Resource, mergeIds } from '@hcengineering/platform' -import { type AnyComponent } from '@hcengineering/ui' +import { type AnyComponent } from '@hcengineering/ui/src/types' import { workbenchId } from '@hcengineering/workbench' import workbench from '@hcengineering/workbench-resources/src/plugin' diff --git a/plugins/recruit-resources/package.json b/plugins/recruit-resources/package.json index 44e0d409fe..0048d38c9a 100644 --- a/plugins/recruit-resources/package.json +++ b/plugins/recruit-resources/package.json @@ -59,6 +59,7 @@ "@hcengineering/rekoni": "^0.6.0", "@hcengineering/notification": "^0.6.15", "@hcengineering/tags": "^0.6.11", + "@hcengineering/tags-resources": "^0.6.0", "@hcengineering/calendar": "^0.6.16", "@hcengineering/tracker": "^0.6.12" } diff --git a/plugins/recruit-resources/src/components/SkillsView.svelte b/plugins/recruit-resources/src/components/SkillsView.svelte index caaee72c30..643b8928cf 100644 --- a/plugins/recruit-resources/src/components/SkillsView.svelte +++ b/plugins/recruit-resources/src/components/SkillsView.svelte @@ -1,5 +1,5 @@