diff --git a/apps/meteor/jest.config.ts b/apps/meteor/jest.config.ts index 07cc07a4bccca..5dd247ce4406e 100644 --- a/apps/meteor/jest.config.ts +++ b/apps/meteor/jest.config.ts @@ -44,7 +44,6 @@ export default { '/app/api/server/**.spec.ts', '/app/api/server/helpers/**.spec.ts', '/app/api/server/middlewares/**.spec.ts', - '/server/services/media-call/**.spec.ts', ], coveragePathIgnorePatterns: ['/node_modules/'], }, diff --git a/apps/meteor/server/services/media-call/service.ts b/apps/meteor/server/services/media-call/service.ts index 3950721d1e84b..b52476c272196 100644 --- a/apps/meteor/server/services/media-call/service.ts +++ b/apps/meteor/server/services/media-call/service.ts @@ -12,8 +12,8 @@ import { callServer, type IMediaCallServerSettings } from '@rocket.chat/media-ca import { isClientMediaSignal, type ClientMediaSignal, type ServerMediaSignal } from '@rocket.chat/media-signaling'; import type { InsertionModel } from '@rocket.chat/model-typings'; import { CallHistory, MediaCalls, Rooms, Users } from '@rocket.chat/models'; +import { getHistoryMessagePayload } from '@rocket.chat/ui-voip/dist/ui-kit/getHistoryMessagePayload'; -import { getHistoryMessagePayload } from './getHistoryMessagePayload'; import { sendMessage } from '../../../app/lib/server/functions/sendMessage'; import { settings } from '../../../app/settings/server'; import { createDirectMessage } from '../../methods/createDirectMessage'; diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json index 953eefe9accc5..69e4effb43c5d 100644 --- a/packages/ui-voip/package.json +++ b/packages/ui-voip/package.json @@ -29,6 +29,7 @@ "devDependencies": { "@playwright/test": "^1.52.0", "@react-spectrum/test-utils": "~1.0.0-alpha.8", + "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/css-in-js": "~0.31.25", "@rocket.chat/eslint-config": "workspace:^", "@rocket.chat/fuselage": "^0.69.0", @@ -42,6 +43,7 @@ "@rocket.chat/ui-avatar": "workspace:^", "@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^", + "@rocket.chat/ui-kit": "workspace:^", "@storybook/addon-a11y": "^8.6.14", "@storybook/addon-actions": "^8.6.14", "@storybook/addon-docs": "^8.6.14", @@ -59,6 +61,7 @@ "@types/jest-axe": "~3.5.9", "@types/react": "~18.3.26", "@types/react-dom": "~18.3.7", + "date-fns": "~4.1.0", "eslint": "~8.45.0", "eslint-plugin-react": "~7.37.5", "eslint-plugin-react-hooks": "~5.0.0", @@ -81,6 +84,7 @@ "@rocket.chat/ui-avatar": "workspace:^", "@rocket.chat/ui-client": "workspace:^", "@rocket.chat/ui-contexts": "workspace:^", + "date-fns": "*", "react": "*", "react-aria": "~3.23.1", "react-dom": "*" diff --git a/packages/ui-voip/src/index.ts b/packages/ui-voip/src/index.ts index 1bdb9100eb5ac..f81a2ded8a160 100644 --- a/packages/ui-voip/src/index.ts +++ b/packages/ui-voip/src/index.ts @@ -3,3 +3,5 @@ export { default as MediaCallProvider } from './context/MediaCallProvider'; export { MediaCallContext, useMediaCallExternalContext as useMediaCallContext, type PeerInfo } from './context'; export { useMediaCallAction } from './hooks'; + +export { getHistoryMessagePayload } from './ui-kit/getHistoryMessagePayload'; diff --git a/apps/meteor/server/services/media-call/getHistoryMessagePayload.spec.ts b/packages/ui-voip/src/ui-kit/getHistoryMessagePayload.spec.ts similarity index 100% rename from apps/meteor/server/services/media-call/getHistoryMessagePayload.spec.ts rename to packages/ui-voip/src/ui-kit/getHistoryMessagePayload.spec.ts diff --git a/apps/meteor/server/services/media-call/getHistoryMessagePayload.ts b/packages/ui-voip/src/ui-kit/getHistoryMessagePayload.ts similarity index 100% rename from apps/meteor/server/services/media-call/getHistoryMessagePayload.ts rename to packages/ui-voip/src/ui-kit/getHistoryMessagePayload.ts diff --git a/yarn.lock b/yarn.lock index dba4c6890949f..809a8eb8120c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10403,7 +10403,7 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/ui-kit@workspace:packages/ui-kit, @rocket.chat/ui-kit@workspace:~": +"@rocket.chat/ui-kit@workspace:^, @rocket.chat/ui-kit@workspace:packages/ui-kit, @rocket.chat/ui-kit@workspace:~": version: 0.0.0-use.local resolution: "@rocket.chat/ui-kit@workspace:packages/ui-kit" dependencies: @@ -10518,6 +10518,7 @@ __metadata: dependencies: "@playwright/test": "npm:^1.52.0" "@react-spectrum/test-utils": "npm:~1.0.0-alpha.8" + "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/css-in-js": "npm:~0.31.25" "@rocket.chat/desktop-api": "workspace:^" "@rocket.chat/emitter": "npm:~0.31.25" @@ -10534,6 +10535,7 @@ __metadata: "@rocket.chat/ui-avatar": "workspace:^" "@rocket.chat/ui-client": "workspace:^" "@rocket.chat/ui-contexts": "workspace:^" + "@rocket.chat/ui-kit": "workspace:^" "@storybook/addon-a11y": "npm:^8.6.14" "@storybook/addon-actions": "npm:^8.6.14" "@storybook/addon-docs": "npm:^8.6.14" @@ -10552,6 +10554,7 @@ __metadata: "@types/jest-axe": "npm:~3.5.9" "@types/react": "npm:~18.3.26" "@types/react-dom": "npm:~18.3.7" + date-fns: "npm:~4.1.0" eslint: "npm:~8.45.0" eslint-plugin-react: "npm:~7.37.5" eslint-plugin-react-hooks: "npm:~5.0.0" @@ -10575,6 +10578,7 @@ __metadata: "@rocket.chat/ui-avatar": "workspace:^" "@rocket.chat/ui-client": "workspace:^" "@rocket.chat/ui-contexts": "workspace:^" + date-fns: "*" react: "*" react-aria: ~3.23.1 react-dom: "*"