diff --git a/dev/prod/package.json b/dev/prod/package.json index 3e85389df8..54c9665feb 100644 --- a/dev/prod/package.json +++ b/dev/prod/package.json @@ -125,6 +125,9 @@ "@hcengineering/tags-assets": "^0.6.0", "@hcengineering/tags": "^0.6.12", "@hcengineering/tags-resources": "^0.6.0", + "@hcengineering/time": "^0.6.0", + "@hcengineering/time-assets": "^0.6.0", + "@hcengineering/time-resources": "^0.6.0", "@hcengineering/server-chunter": "^0.6.0", "@hcengineering/server-chunter-resources": "^0.6.0", "@hcengineering/server-inventory": "^0.6.1", diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts index 92e0297b5a..236f71523f 100644 --- a/dev/prod/src/platform.ts +++ b/dev/prod/src/platform.ts @@ -40,6 +40,7 @@ import { tagsId } from '@hcengineering/tags' import { taskId } from '@hcengineering/task' import telegram, { telegramId } from '@hcengineering/telegram' import { templatesId } from '@hcengineering/templates' +import { timeId } from '@hcengineering/time' import tracker, { trackerId } from '@hcengineering/tracker' import uiPlugin from '@hcengineering/ui' import view, { viewId } from '@hcengineering/view' @@ -71,6 +72,7 @@ import '@hcengineering/tags-assets' import '@hcengineering/task-assets' import '@hcengineering/telegram-assets' import '@hcengineering/templates-assets' +import '@hcengineering/time-assets' import '@hcengineering/tracker-assets' import '@hcengineering/view-assets' import '@hcengineering/workbench-assets' @@ -134,6 +136,7 @@ function configureI18n(): void { addStringsLoader(trackerId, async (lang: string) => await import(`@hcengineering/tracker-assets/lang/${lang}.json`)) addStringsLoader(viewId, async (lang: string) => await import(`@hcengineering/view-assets/lang/${lang}.json`)) addStringsLoader(workbenchId, async (lang: string) => await import(`@hcengineering/workbench-assets/lang/${lang}.json`)) + addStringsLoader(timeId, async (lang: string) => await import(`@hcengineering/time-assets/lang/${lang}.json`)) addStringsLoader(documentId, async (lang: string) => await import(`@hcengineering/document-assets/lang/${lang}.json`)) addStringsLoader(guestId, async (lang: string) => await import(`@hcengineering/guest-assets/lang/${lang}.json`)) } @@ -213,6 +216,7 @@ export async function configurePlatform() { addLocation(supportId, () => import(/* webpackChunkName: "support" */ '@hcengineering/support-resources')) addLocation(documentId, () => import(/* webpackChunkName: "document" */ '@hcengineering/document-resources')) addLocation(guestId, () => import(/* webpackChunkName: "guest" */ '@hcengineering/guest-resources')) + addLocation(timeId, () => import(/* webpackChunkName: "time" */ '@hcengineering/time-resources')) setMetadata(client.metadata.FilterModel, true) setMetadata(client.metadata.ExtraPlugins, ['preference' as Plugin]) diff --git a/dev/tool/package.json b/dev/tool/package.json index 3f99ba67c6..391178d119 100644 --- a/dev/tool/package.json +++ b/dev/tool/package.json @@ -122,6 +122,8 @@ "@hcengineering/server-activity-resources": "^0.6.0", "@hcengineering/server-guest": "^0.6.0", "@hcengineering/server-guest-resources": "^0.6.0", + "@hcengineering/server-time": "^0.6.0", + "@hcengineering/server-time-resources": "^0.6.0", "@hcengineering/setting": "^0.6.11", "@hcengineering/tags": "^0.6.12", "@hcengineering/task": "^0.6.13", diff --git a/dev/tool/src/__start.ts b/dev/tool/src/__start.ts index 8eebfe1bae..449e968a5d 100644 --- a/dev/tool/src/__start.ts +++ b/dev/tool/src/__start.ts @@ -18,15 +18,15 @@ import { prepareTools as prepareToolsRaw } from '@hcengineering/server-tool' import { type Data, type Tx, type Version } from '@hcengineering/core' import { type MinioService } from '@hcengineering/minio' import { type MigrateOperation } from '@hcengineering/model' -import builder, { migrateOperations, getModelVersion } from '@hcengineering/model-all' +import builder, { getModelVersion, migrateOperations } from '@hcengineering/model-all' import { devTool } from '.' import { addLocation } from '@hcengineering/platform' import { serverActivityId } from '@hcengineering/server-activity' import { serverAttachmentId } from '@hcengineering/server-attachment' -import { serverCollaborationId } from '@hcengineering/server-collaboration' import { serverCalendarId } from '@hcengineering/server-calendar' import { serverChunterId } from '@hcengineering/server-chunter' +import { serverCollaborationId } from '@hcengineering/server-collaboration' import { serverContactId } from '@hcengineering/server-contact' import { serverDocumentId } from '@hcengineering/server-document' import { serverGmailId } from '@hcengineering/server-gmail' @@ -41,6 +41,7 @@ import { serverSettingId } from '@hcengineering/server-setting' import { serverTagsId } from '@hcengineering/server-tags' import { serverTaskId } from '@hcengineering/server-task' import { serverTelegramId } from '@hcengineering/server-telegram' +import { serverTimeId } from '@hcengineering/server-time' import { serverTrackerId } from '@hcengineering/server-tracker' import { serverViewId } from '@hcengineering/server-view' @@ -64,6 +65,7 @@ addLocation(serverHrId, () => import('@hcengineering/server-hr-resources')) addLocation(serverRequestId, () => import('@hcengineering/server-request-resources')) addLocation(serverViewId, () => import('@hcengineering/server-view-resources')) addLocation(serverDocumentId, () => import('@hcengineering/server-document-resources')) +addLocation(serverTimeId, () => import('@hcengineering/server-time-resources')) addLocation(serverGuestId, () => import('@hcengineering/server-guest-resources')) function prepareTools (): { diff --git a/models/all/package.json b/models/all/package.json index 4f0c047382..4bd5b0cd09 100644 --- a/models/all/package.json +++ b/models/all/package.json @@ -87,6 +87,8 @@ "@hcengineering/model-guest": "^0.6.0", "@hcengineering/model-server-guest": "^0.6.0", "@hcengineering/model-document": "^0.6.0", - "@hcengineering/model-server-document": "^0.6.0" + "@hcengineering/model-server-document": "^0.6.0", + "@hcengineering/model-time": "^0.6.0", + "@hcengineering/model-server-time": "^0.6.0" } } diff --git a/models/all/src/index.ts b/models/all/src/index.ts index 8b3d70d4e5..b5cdf01b9d 100644 --- a/models/all/src/index.ts +++ b/models/all/src/index.ts @@ -27,6 +27,7 @@ import { createModel as coreModel } from '@hcengineering/model-core' import document, { documentId, createModel as documentModel } from '@hcengineering/model-document' import gmail, { gmailId, createModel as gmailModel } from '@hcengineering/model-gmail' import hr, { hrId, createModel as hrModel } from '@hcengineering/model-hr' +import { timeId, createModel as timeModel } from '@hcengineering/model-time' import inventory, { inventoryId, createModel as inventoryModel } from '@hcengineering/model-inventory' import lead, { leadId, createModel as leadModel } from '@hcengineering/model-lead' import notification, { notificationId, createModel as notificationModel } from '@hcengineering/model-notification' @@ -71,6 +72,7 @@ import view, { viewId, createModel as viewModel } from '@hcengineering/model-vie import workbench, { workbenchId, createModel as workbenchModel } from '@hcengineering/model-workbench' import { guestId, createModel as guestModel } from '@hcengineering/model-guest' import { serverGuestId, createModel as serverGuestModel } from '@hcengineering/model-server-guest' +import { serverTimeId, createModel as serverTimeModel } from '@hcengineering/model-server-time' import { openAIId, createModel as serverOpenAI } from '@hcengineering/model-server-openai' import { createModel as serverTranslate, translateId } from '@hcengineering/model-server-translate' @@ -291,6 +293,7 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ classFilter: defaultFilter } ], + [timeModel, timeId], [supportModel, supportId], [serverCoreModel, serverCoreId], @@ -317,6 +320,7 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ [serverTranslate, translateId], [serverOpenAI, openAIId], [serverDocumentModel, serverDocumentId], + [serverTimeModel, serverTimeId], [serverGuestModel, serverGuestId] ] diff --git a/pods/server/package.json b/pods/server/package.json index d4e0a2d91b..71967f5ce9 100644 --- a/pods/server/package.json +++ b/pods/server/package.json @@ -88,6 +88,8 @@ "@hcengineering/server-preference": "^0.6.0", "@hcengineering/server-telegram": "^0.6.0", "@hcengineering/server-telegram-resources": "^0.6.0", + "@hcengineering/server-time": "^0.6.0", + "@hcengineering/server-time-resources": "^0.6.0", "@hcengineering/server-hr": "^0.6.0", "@hcengineering/server-hr-resources": "^0.6.0", "@hcengineering/server-request": "^0.6.0", diff --git a/pods/server/src/server.ts b/pods/server/src/server.ts index 54379e240e..7eef51b475 100644 --- a/pods/server/src/server.ts +++ b/pods/server/src/server.ts @@ -46,27 +46,30 @@ import { getMetricsContext, type MinioConfig } from '@hcengineering/server' +import { serverActivityId } from '@hcengineering/server-activity' import { serverAttachmentId } from '@hcengineering/server-attachment' -import { CollaborativeContentRetrievalStage, serverCollaborationId } from '@hcengineering/server-collaboration' import { serverCalendarId } from '@hcengineering/server-calendar' import { serverChunterId } from '@hcengineering/server-chunter' +import { CollaborativeContentRetrievalStage, serverCollaborationId } from '@hcengineering/server-collaboration' import { serverContactId } from '@hcengineering/server-contact' import { ContentRetrievalStage, - type ContentTextAdapter, createInMemoryAdapter, createPipeline, - type DbConfiguration, FullSummaryStage, - type FullTextAdapter, - type FullTextPipelineStage, FullTextPushStage, globalIndexer, IndexedFieldStage, + type ContentTextAdapter, + type DbConfiguration, + type FullTextAdapter, + type FullTextPipelineStage, type MiddlewareCreator, type Pipeline } from '@hcengineering/server-core' +import { serverDocumentId } from '@hcengineering/server-document' import { serverGmailId } from '@hcengineering/server-gmail' +import { serverGuestId } from '@hcengineering/server-guest' import { serverHrId } from '@hcengineering/server-hr' import { serverInventoryId } from '@hcengineering/server-inventory' import { serverLeadId } from '@hcengineering/server-lead' @@ -77,19 +80,17 @@ import { serverSettingId } from '@hcengineering/server-setting' import { serverTagsId } from '@hcengineering/server-tags' import { serverTaskId } from '@hcengineering/server-task' import { serverTelegramId } from '@hcengineering/server-telegram' +import { serverTimeId } from '@hcengineering/server-time' import { type Token } from '@hcengineering/server-token' import { serverTrackerId } from '@hcengineering/server-tracker' import { serverViewId } from '@hcengineering/server-view' -import { serverActivityId } from '@hcengineering/server-activity' -import { serverDocumentId } from '@hcengineering/server-document' -import { serverGuestId } from '@hcengineering/server-guest' import { - type BroadcastCall, ClientSession, + start as startJsonRpc, + type BroadcastCall, type PipelineFactory, type ServerFactory, - type Session, - start as startJsonRpc + type Session } from '@hcengineering/server-ws' import { activityId } from '@hcengineering/activity' @@ -221,6 +222,7 @@ export function start ( addLocation(serverGuestId, () => import('@hcengineering/server-guest-resources')) addLocation(openAIId, () => Promise.resolve({ default: openAIPluginImpl })) addLocation(serverDocumentId, () => import('@hcengineering/server-document-resources')) + addLocation(serverTimeId, () => import('@hcengineering/server-time-resources')) const middlewares: MiddlewareCreator[] = [ ModifiedMiddleware.create,