diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 697190fc012..b1696566e86 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -431,6 +431,9 @@ dependencies: '@rush-temp/model-preference': specifier: file:./projects/model-preference.tgz version: file:projects/model-preference.tgz + '@rush-temp/model-presence': + specifier: file:./projects/model-presence.tgz + version: file:projects/model-presence.tgz '@rush-temp/model-presentation': specifier: file:./projects/model-presentation.tgz version: file:projects/model-presentation.tgz @@ -686,6 +689,12 @@ dependencies: '@rush-temp/preference-assets': specifier: file:./projects/preference-assets.tgz version: file:projects/preference-assets.tgz(esbuild@0.20.1)(ts-node@10.9.2) + '@rush-temp/presence': + specifier: file:./projects/presence.tgz + version: file:projects/presence.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2) + '@rush-temp/presence-resources': + specifier: file:./projects/presence-resources.tgz + version: file:projects/presence-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2) '@rush-temp/presentation': specifier: file:./projects/presentation.tgz version: file:projects/presentation.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2) @@ -1607,9 +1616,6 @@ dependencies: fast-copy: specifier: ~3.0.1 version: 3.0.1 - fast-equals: - specifier: ^5.0.1 - version: 5.0.1 file-api: specifier: ^0.10.4 version: 0.10.4 @@ -25738,7 +25744,7 @@ packages: dev: false file:projects/model-all.tgz: - resolution: {integrity: sha512-t+T01n/lk1uFmDQvCw+ldE7yBemi2GcvJHXQKaRBXGprTf//JM9Wd9GgvQoYyQsQO7HA8ilAkmnVH3gfP7xxFg==, tarball: file:projects/model-all.tgz} + resolution: {integrity: sha512-POSTd7U69WG8HMf3/Budl2bpSfRrigifVT+i8kAOYT8EfuJvT0squXq0TMjYThMNQak91IwJF040+PjIWtlTBw==, tarball: file:projects/model-all.tgz} name: '@rush-temp/model-all' version: 0.0.0 dependencies: @@ -26157,6 +26163,24 @@ packages: - supports-color dev: false + file:projects/model-presence.tgz: + resolution: {integrity: sha512-bE9NfhmtkeenHePBuorhYSQloGaNnGqtlw2i8ObXBD2ecu21ArwfbrJdHnQiy+Qtq8rs3j+rcCV/BcWpJSBJYQ==, tarball: file:projects/model-presence.tgz} + name: '@rush-temp/model-presence' + version: 0.0.0 + dependencies: + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.6.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2) + eslint: 8.56.0 + eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)(typescript@5.6.2) + eslint-plugin-import: 2.29.1(eslint@8.56.0) + eslint-plugin-n: 15.7.0(eslint@8.56.0) + eslint-plugin-promise: 6.1.1(eslint@8.56.0) + prettier: 3.2.5 + typescript: 5.6.2 + transitivePeerDependencies: + - supports-color + dev: false + file:projects/model-presentation.tgz: resolution: {integrity: sha512-fwOpgUcuXhN/upzKDq9tRE1T4bWjBYLHGqHoqu3yrOo82+0aIM7qtCu4bzhl9AdLaOtD/5VYYzFCFWYo2KfRBQ==, tarball: file:projects/model-presentation.tgz} name: '@rush-temp/model-presentation' @@ -28634,6 +28658,82 @@ packages: - ts-node dev: false + file:projects/presence-resources.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): + resolution: {integrity: sha512-wPkp1Gl14BRxVtSA7GHeRGse3P/mNyw8ZMFaB+GWPy6uzKem9XOIIk6KKgvNgyZBZROcI9KxlEc5nCn6JUZNUw==, tarball: file:projects/presence-resources.tgz} + id: file:projects/presence-resources.tgz + name: '@rush-temp/presence-resources' + version: 0.0.0 + dependencies: + '@types/jest': 29.5.12 + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.6.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2) + eslint: 8.56.0 + eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)(typescript@5.6.2) + eslint-plugin-import: 2.29.1(eslint@8.56.0) + eslint-plugin-n: 15.7.0(eslint@8.56.0) + eslint-plugin-promise: 6.1.1(eslint@8.56.0) + eslint-plugin-svelte: 2.35.1(eslint@8.56.0)(svelte@4.2.19)(ts-node@10.9.2) + fast-equals: 5.0.1 + jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2) + prettier: 3.2.5 + prettier-plugin-svelte: 3.2.2(prettier@3.2.5)(svelte@4.2.19) + sass: 1.71.1 + svelte: 4.2.19 + svelte-check: 3.6.9(postcss-load-config@4.0.2)(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.19) + svelte-eslint-parser: 0.33.1(svelte@4.2.19) + svelte-loader: 3.2.0(svelte@4.2.19) + svelte-preprocess: 5.1.3(postcss-load-config@4.0.2)(postcss@8.4.35)(sass@1.71.1)(svelte@4.2.19)(typescript@5.6.2) + ts-jest: 29.1.2(esbuild@0.20.1)(jest@29.7.0)(typescript@5.6.2) + typescript: 5.6.2 + transitivePeerDependencies: + - '@babel/core' + - '@jest/types' + - '@types/node' + - babel-jest + - babel-plugin-macros + - coffeescript + - esbuild + - less + - node-notifier + - postcss + - postcss-load-config + - pug + - stylus + - sugarss + - supports-color + - ts-node + dev: false + + file:projects/presence.tgz(@types/node@20.11.19)(esbuild@0.20.1)(ts-node@10.9.2): + resolution: {integrity: sha512-UAKP+9sJPe3sFFYkuaoRLl5OGmzjdjb35+WCRBenMndS9HljrLekTZp2DL9F1XiyBa4OkB38vYYy2OoobeXx6Q==, tarball: file:projects/presence.tgz} + id: file:projects/presence.tgz + name: '@rush-temp/presence' + version: 0.0.0 + dependencies: + '@types/jest': 29.5.12 + '@typescript-eslint/eslint-plugin': 6.21.0(@typescript-eslint/parser@6.21.0)(eslint@8.56.0)(typescript@5.6.2) + '@typescript-eslint/parser': 6.21.0(eslint@8.56.0)(typescript@5.6.2) + eslint: 8.56.0 + eslint-config-standard-with-typescript: 40.0.0(@typescript-eslint/eslint-plugin@6.21.0)(eslint-plugin-import@2.29.1)(eslint-plugin-n@15.7.0)(eslint-plugin-promise@6.1.1)(eslint@8.56.0)(typescript@5.6.2) + eslint-plugin-import: 2.29.1(eslint@8.56.0) + eslint-plugin-n: 15.7.0(eslint@8.56.0) + eslint-plugin-promise: 6.1.1(eslint@8.56.0) + jest: 29.7.0(@types/node@20.11.19)(ts-node@10.9.2) + prettier: 3.2.5 + ts-jest: 29.1.2(esbuild@0.20.1)(jest@29.7.0)(typescript@5.6.2) + typescript: 5.6.2 + transitivePeerDependencies: + - '@babel/core' + - '@jest/types' + - '@types/node' + - babel-jest + - babel-plugin-macros + - esbuild + - node-notifier + - supports-color + - ts-node + dev: false + file:projects/presentation.tgz(@types/node@20.11.19)(esbuild@0.20.1)(postcss-load-config@4.0.2)(postcss@8.4.35)(ts-node@10.9.2): resolution: {integrity: sha512-oPHDMQuOu5zTYR4++5vrc3LWTZgdZLCxCmnFGSHhNSOG0uRezdWBXlJyN0IL85CI2S03RO/WT16siUOrjG5vwA==, tarball: file:projects/presentation.tgz} id: file:projects/presentation.tgz @@ -28795,7 +28895,7 @@ packages: dev: false file:projects/prod.tgz(bufferutil@4.0.8)(sass@1.71.1)(ts-node@10.9.2)(utf-8-validate@6.0.4): - resolution: {integrity: sha512-5Lih7OOjrS1TenY/2rwnCFmfxjY0Ef0XgCiKURsCa6Rr5BixyOBIKDznMdFXIogr6vxKf0QWbpJVYm6iZE4J/A==, tarball: file:projects/prod.tgz} + resolution: {integrity: sha512-Vhce2P4UQlBdcnn6eYAjevEqIDE2pkstFrPKam87+2O8XmnR7ZPzuMVZwkWVbVmXsNjE0N9lKiKNYMdcW2ByRQ==, tarball: file:projects/prod.tgz} id: file:projects/prod.tgz name: '@rush-temp/prod' version: 0.0.0 diff --git a/desktop/package.json b/desktop/package.json index 468cdd5751b..ce572eaf13f 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -182,6 +182,8 @@ "@hcengineering/guest": "^0.6.4", "@hcengineering/guest-assets": "^0.6.0", "@hcengineering/guest-resources": "^0.6.0", + "@hcengineering/presence": "^0.6.0", + "@hcengineering/presence-resources": "^0.6.0", "@hcengineering/uploader": "^0.6.0", "@hcengineering/uploader-assets": "^0.6.0", "@hcengineering/uploader-resources": "^0.6.0", diff --git a/desktop/src/ui/platform.ts b/desktop/src/ui/platform.ts index 3f481785885..8785b3d8b6d 100644 --- a/desktop/src/ui/platform.ts +++ b/desktop/src/ui/platform.ts @@ -29,6 +29,7 @@ import { leadId } from '@hcengineering/lead' import login, { loginId } from '@hcengineering/login' import notification, { notificationId } from '@hcengineering/notification' import onboard, { onboardId } from '@hcengineering/onboard' +import presence, { presenceId } from '@hcengineering/presence' import { recruitId } from '@hcengineering/recruit' import rekoni from '@hcengineering/rekoni' import { requestId } from '@hcengineering/request' @@ -245,6 +246,7 @@ export async function configurePlatform (): Promise { setMetadata(uiPlugin.metadata.DefaultApplication, login.component.LoginApp) setMetadata(analyticsCollector.metadata.EndpointURL, config.ANALYTICS_COLLECTOR_URL) setMetadata(aiBot.metadata.EndpointURL, config.AI_URL) + setMetadata(presence.metadata.PresenceUrl, config.PRESENCE_URL ?? '') const languages = myBranding.languages !== undefined && myBranding.languages !== '' ? myBranding.languages.split(',').map((l) => l.trim()) : ['en', 'ru', 'es', 'pt', 'zh', 'fr', 'cs', 'it'] @@ -303,6 +305,7 @@ export async function configurePlatform (): Promise { addLocation(productsId, async () => await import('@hcengineering/products-resources')) addLocation(documentsId, async () => await import('@hcengineering/controlled-documents-resources')) addLocation(uploaderId, async () => await import('@hcengineering/uploader-resources')) + addLocation(presenceId, async () => await import('@hcengineering/presence-resources')) addLocation(githubId, async () => await import(/* webpackChunkName: "github" */ '@hcengineering/github-resources')) addLocation( desktopPreferencesId, @@ -313,7 +316,7 @@ export async function configurePlatform (): Promise { addLocation(printId, () => import(/* webpackChunkName: "print" */ '@hcengineering/print-resources')) addLocation(textEditorId, () => import(/* webpackChunkName: "text-editor" */ '@hcengineering/text-editor-resources')) addLocation(testManagementId, () => import(/* webpackChunkName: "test-management" */ '@hcengineering/test-management-resources')) - addLocation(surveyId, () => import(/* webpackChunkName: "uploader" */ '@hcengineering/survey-resources')) + addLocation(surveyId, () => import(/* webpackChunkName: "survey" */ '@hcengineering/survey-resources')) setMetadata(client.metadata.FilterModel, 'ui') setMetadata(client.metadata.ExtraPlugins, ['preference' as Plugin]) diff --git a/desktop/src/ui/types.ts b/desktop/src/ui/types.ts index 14aca214cb6..195ac20381e 100644 --- a/desktop/src/ui/types.ts +++ b/desktop/src/ui/types.ts @@ -35,6 +35,7 @@ export interface Config { DESKTOP_UPDATES_URL?: string DESKTOP_UPDATES_CHANNEL?: string TELEGRAM_BOT_URL?: string + PRESENCE_URL?: string STATS_URL?: string } diff --git a/dev/prod/package.json b/dev/prod/package.json index f75d8ba8341..a6eec50d274 100644 --- a/dev/prod/package.json +++ b/dev/prod/package.json @@ -213,6 +213,8 @@ "@hcengineering/print": "^0.6.0", "@hcengineering/print-assets": "^0.6.0", "@hcengineering/print-resources": "^0.6.0", + "@hcengineering/presence": "^0.6.0", + "@hcengineering/presence-resources": "^0.6.0", "@hcengineering/uploader": "^0.6.0", "@hcengineering/uploader-assets": "^0.6.0", "@hcengineering/uploader-resources": "^0.6.0", diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts index f4e20c97faf..54141344df2 100644 --- a/dev/prod/src/platform.ts +++ b/dev/prod/src/platform.ts @@ -62,6 +62,7 @@ import { viewId } from '@hcengineering/view' import workbench, { workbenchId } from '@hcengineering/workbench' import { testManagementId } from '@hcengineering/test-management' import { surveyId } from '@hcengineering/survey' +import presence, { presenceId } from '@hcengineering/presence' import { bitrixId } from '@hcengineering/bitrix' @@ -161,6 +162,7 @@ export interface Config { PREVIEW_CONFIG?: string UPLOAD_CONFIG?: string STATS_URL?: string + PRESENCE_URL?: string USE_BINARY_PROTOCOL?: boolean, TRANSACTOR_OVERRIDE?: string } @@ -342,6 +344,7 @@ export async function configurePlatform() { setMetadata(love.metadata.WebSocketURL, config.LIVEKIT_WS) setMetadata(print.metadata.PrintURL, config.PRINT_URL) setMetadata(sign.metadata.SignURL, config.SIGN_URL) + setMetadata(presence.metadata.PresenceUrl, config.PRESENCE_URL ?? '') const languages = myBranding.languages ? (myBranding.languages as string).split(',').map((l) => l.trim()) : ['en', 'ru', 'es', 'pt', 'zh', 'fr', 'cs', 'it'] @@ -409,7 +412,8 @@ export async function configurePlatform() { addLocation(textEditorId, () => import(/* webpackChunkName: "text-editor" */ '@hcengineering/text-editor-resources')) addLocation(uploaderId, () => import(/* webpackChunkName: "uploader" */ '@hcengineering/uploader-resources')) addLocation(testManagementId, () => import(/* webpackChunkName: "test-management" */ '@hcengineering/test-management-resources')) - addLocation(surveyId, () => import(/* webpackChunkName: "uploader" */ '@hcengineering/survey-resources')) + addLocation(surveyId, () => import(/* webpackChunkName: "survey" */ '@hcengineering/survey-resources')) + addLocation(presenceId, () => import(/* webpackChunkName: "presence" */ '@hcengineering/presence-resources')) setMetadata(client.metadata.FilterModel, 'ui') setMetadata(client.metadata.ExtraPlugins, ['preference' as Plugin]) diff --git a/models/all/package.json b/models/all/package.json index 141d6e641ab..e15bd0faf02 100644 --- a/models/all/package.json +++ b/models/all/package.json @@ -112,6 +112,7 @@ "@hcengineering/model-ai-bot": "^0.6.0", "@hcengineering/model-server-fulltext": "^0.6.0", "@hcengineering/model-test-management": "^0.6.0", - "@hcengineering/model-survey": "^0.6.0" + "@hcengineering/model-survey": "^0.6.0", + "@hcengineering/model-presence": "^0.6.0" } } diff --git a/models/all/src/index.ts b/models/all/src/index.ts index 49c616188bf..82fae835237 100644 --- a/models/all/src/index.ts +++ b/models/all/src/index.ts @@ -106,6 +106,7 @@ import { } from '@hcengineering/model-server-controlled-documents' import { serverFulltextId, createModel as serverFulltextModel } from '@hcengineering/model-server-fulltext' import { surveyId, createModel as surveyModel } from '@hcengineering/model-survey' +import { presenceId, createModel as presenceModel } from '@hcengineering/model-presence' import { type Plugin } from '@hcengineering/platform' @@ -422,6 +423,7 @@ export default function buildModel (enabled: string[] = ['*'], disabled: string[ } ], [surveyModel, surveyId], + [presenceModel, presenceId], [serverCoreModel, serverCoreId], [serverAttachmentModel, serverAttachmentId], diff --git a/models/presence/.eslintrc.js b/models/presence/.eslintrc.js new file mode 100644 index 00000000000..c1cf82cba08 --- /dev/null +++ b/models/presence/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + extends: ['./node_modules/@hcengineering/platform-rig/profiles/model/eslint.config.json'], + parserOptions: { + tsconfigRootDir: __dirname, + project: './tsconfig.json' + } +} diff --git a/models/presence/.npmignore b/models/presence/.npmignore new file mode 100644 index 00000000000..e3ec093c383 --- /dev/null +++ b/models/presence/.npmignore @@ -0,0 +1,4 @@ +* +!/lib/** +!CHANGELOG.md +/lib/**/__tests__/ diff --git a/models/presence/config/rig.json b/models/presence/config/rig.json new file mode 100644 index 00000000000..2f6be366054 --- /dev/null +++ b/models/presence/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + "rigPackageName": "@hcengineering/platform-rig", + "rigProfile": "model" +} diff --git a/models/presence/package.json b/models/presence/package.json new file mode 100644 index 00000000000..6eb2d0d6ad2 --- /dev/null +++ b/models/presence/package.json @@ -0,0 +1,41 @@ +{ + "name": "@hcengineering/model-presence", + "version": "0.6.0", + "main": "lib/index.js", + "svelte": "src/index.ts", + "types": "types/index.d.ts", + "author": "Hardcore Engineering Inc.", + "template": "@hcengineering/model-package", + "license": "EPL-2.0", + "scripts": { + "build": "compile", + "build:watch": "compile", + "format": "format src", + "_phase:build": "compile transpile src", + "_phase:format": "format src", + "_phase:validate": "compile validate" + }, + "devDependencies": { + "@hcengineering/platform-rig": "^0.6.0", + "@typescript-eslint/eslint-plugin": "^6.11.0", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-n": "^15.4.0", + "eslint": "^8.54.0", + "@typescript-eslint/parser": "^6.11.0", + "eslint-config-standard-with-typescript": "^40.0.0", + "prettier": "^3.1.0", + "typescript": "^5.3.3" + }, + "dependencies": { + "@hcengineering/core": "^0.6.32", + "@hcengineering/model": "^0.6.11", + "@hcengineering/model-core": "^0.6.0", + "@hcengineering/model-presentation": "^0.6.0", + "@hcengineering/model-workbench": "^0.6.1", + "@hcengineering/platform": "^0.6.11", + "@hcengineering/ui": "^0.6.15", + "@hcengineering/presence": "^0.6.0", + "@hcengineering/presence-resources": "^0.6.0" + } +} diff --git a/models/presence/src/index.ts b/models/presence/src/index.ts new file mode 100644 index 00000000000..0bb8843cfdd --- /dev/null +++ b/models/presence/src/index.ts @@ -0,0 +1,31 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { type Builder } from '@hcengineering/model' +import core from '@hcengineering/model-core' +import presentation from '@hcengineering/model-presentation' +import workbench from '@hcengineering/model-workbench' + +import presence from './plugin' + +export { presenceId } from '@hcengineering/presence' +export { presence as default } + +export function createModel (builder: Builder): void { + builder.createDoc(presentation.class.ComponentPointExtension, core.space.Model, { + extension: workbench.extensions.WorkbenchExtensions, + component: presence.component.WorkbenchExtension + }) +} diff --git a/models/presence/src/plugin.ts b/models/presence/src/plugin.ts new file mode 100644 index 00000000000..1cb9b1449d3 --- /dev/null +++ b/models/presence/src/plugin.ts @@ -0,0 +1,25 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { mergeIds } from '@hcengineering/platform' +import { type AnyComponent } from '@hcengineering/ui' +import { presenceId } from '@hcengineering/presence' +import presence from '@hcengineering/presence-resources/src/plugin' + +export default mergeIds(presenceId, presence, { + component: { + WorkbenchExtension: '' as AnyComponent + } +}) diff --git a/models/presence/tsconfig.json b/models/presence/tsconfig.json new file mode 100644 index 00000000000..9765b6086db --- /dev/null +++ b/models/presence/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "./node_modules/@hcengineering/platform-rig/profiles/model/tsconfig.json", + + "compilerOptions": { + "rootDir": "./src", + "outDir": "./lib", + "declarationDir": "./types", + "tsBuildInfoFile": ".build/build.tsbuildinfo" + } +} \ No newline at end of file diff --git a/packages/panel/package.json b/packages/panel/package.json index 6e20928a5cb..87c8acbb8a0 100644 --- a/packages/panel/package.json +++ b/packages/panel/package.json @@ -45,6 +45,7 @@ "@hcengineering/chunter": "^0.6.20", "@hcengineering/presentation": "^0.6.3", "@hcengineering/activity": "^0.6.0", - "@hcengineering/calendar": "^0.6.24" + "@hcengineering/calendar": "^0.6.24", + "@hcengineering/presence": "^0.6.0" } } diff --git a/packages/panel/src/components/Panel.svelte b/packages/panel/src/components/Panel.svelte index 9cbe0a16cf1..c0f76bed038 100644 --- a/packages/panel/src/components/Panel.svelte +++ b/packages/panel/src/components/Panel.svelte @@ -29,6 +29,7 @@ } from '@hcengineering/ui' import type { ButtonItem } from '@hcengineering/ui' import { getResource } from '@hcengineering/platform' + import presence from '@hcengineering/presence' export let title: string | undefined = undefined export let withoutActivity: boolean = false @@ -41,6 +42,7 @@ export let isSub: boolean = true export let isAside: boolean = true export let isUtils: boolean = true + export let isPresence: boolean = true export let isCustomAttr: boolean = true export let floatAside: boolean = false export let allowClose: boolean = true @@ -146,6 +148,8 @@ dispatch('select', result.detail) }} > + + {#if !withoutTitle} {#if $$slots.title} @@ -156,6 +160,12 @@ {/if} + + {#if isPresence} + + {/if} + + diff --git a/packages/ui/src/components/Header.svelte b/packages/ui/src/components/Header.svelte index 6fe72d133a2..b047f257dda 100644 --- a/packages/ui/src/components/Header.svelte +++ b/packages/ui/src/components/Header.svelte @@ -35,6 +35,7 @@ export let hideSearch: boolean = false export let hideActions: boolean = false export let hideExtra: boolean = false + export let hidePresence: boolean = false export let overflowExtra: boolean = false export let noPrint: boolean = false export let freezeBefore: boolean = false @@ -149,6 +150,11 @@
+ {#if $$slots.presence && !hidePresence} +
+ +
+ {/if} {#if $$slots.search}
@@ -214,12 +220,19 @@ /> {/if} + {#if $$slots.presence && !hidePresence} +
+ +
+ {/if} + {#if $$slots.search && !hideSearch}
{#if $$slots.actions && !hideActions}
{/if} {/if} + {#if $$slots.extra && !hideExtra}
+ {#if useMaxWidth !== undefined} diff --git a/plugins/chunter-resources/package.json b/plugins/chunter-resources/package.json index 9fee7e7e332..a0afd45ea28 100644 --- a/plugins/chunter-resources/package.json +++ b/plugins/chunter-resources/package.json @@ -62,6 +62,7 @@ "@hcengineering/view-resources": "^0.6.0", "@hcengineering/workbench": "^0.6.16", "@hcengineering/workbench-resources": "^0.6.1", + "@hcengineering/presence-resources": "^0.6.0", "fast-equals": "^5.0.1", "svelte": "^4.2.19", "@hcengineering/text-editor-resources": "^0.6.0", diff --git a/plugins/chunter-resources/src/components/ChannelHeader.svelte b/plugins/chunter-resources/src/components/ChannelHeader.svelte index a55d3b975b2..79cc356ea94 100644 --- a/plugins/chunter-resources/src/components/ChannelHeader.svelte +++ b/plugins/chunter-resources/src/components/ChannelHeader.svelte @@ -32,6 +32,7 @@ export let canOpen: boolean = false export let withAside: boolean = false export let withSearch: boolean = true + export let withPresence: boolean = true export let isAsideShown: boolean = false export let filters: Ref[] = [] export let canOpenInSidebar: boolean = false @@ -80,6 +81,7 @@ {withAside} {isAsideShown} {withSearch} + {withPresence} {canOpenInSidebar} {closeOnEscape} bind:realWidth diff --git a/plugins/chunter-resources/src/components/ChannelSidebarView.svelte b/plugins/chunter-resources/src/components/ChannelSidebarView.svelte index 0c71f5cf72e..cb22412f115 100644 --- a/plugins/chunter-resources/src/components/ChannelSidebarView.svelte +++ b/plugins/chunter-resources/src/components/ChannelSidebarView.svelte @@ -20,6 +20,7 @@ import { Widget } from '@hcengineering/workbench' import { ActivityMessage } from '@hcengineering/activity' import { ChatWidgetTab } from '@hcengineering/chunter' + import { Presence } from '@hcengineering/presence-resources' import { updateTabData } from '@hcengineering/workbench-resources' import Channel from './Channel.svelte' @@ -76,6 +77,7 @@ {#if object && renderChannel && visible} +
+ +
[] = [] export let adaptive: HeaderAdaptive = 'default' export let hideActions: boolean = false @@ -118,6 +120,12 @@ {/if} + + {#if withPresence && object} + + {/if} + + {#if withSearch} { - typingInfo = res - }) - } else { - typingInfoQuery.unsubscribe() - } + let typingInfo: PresenceTyping[] = [] + $: presence = $presenceByObjectId.get(object._id) ?? [] + $: typingInfo = presence.map((p) => p.presence.typing).filter((p) => p !== undefined) function clear (): void { currentMessage = getDefault() @@ -111,29 +107,18 @@ async function deleteTypingInfo (): Promise { if (!withTypingInfo) return - const myTypingInfo = typingInfo.find((info) => info.person === me.person) - if (myTypingInfo === undefined) return - await client.remove(myTypingInfo) + const room = { objectId: object._id, objectClass: object._class } + updateMyPresence(room, { typing: undefined }) } async function updateTypingInfo (): Promise { if (!withTypingInfo) return - const myTypingInfo = typingInfo.find((info) => info.person === me.person) - if (myTypingInfo === undefined) { - await client.createDoc(chunter.class.TypingInfo, getSpace(object), { - objectId: object._id, - objectClass: object._class, - person: me.person, - lastTyping: Date.now() - }) - } else { - throttle.call(() => { - void client.update(myTypingInfo, { - lastTyping: Date.now() - }) - }) - } + throttle.call(() => { + const room = { objectId: object._id, objectClass: object._class } + const typing = { person: me.person, lastTyping: Date.now() } + updateMyPresence(room, { typing }) + }) } function onUpdate (event: CustomEvent): void { diff --git a/plugins/chunter-resources/src/types.ts b/plugins/chunter-resources/src/types.ts new file mode 100644 index 00000000000..a7194a266bb --- /dev/null +++ b/plugins/chunter-resources/src/types.ts @@ -0,0 +1,22 @@ +// +// Copyright © 2020, 2021 Anticrm Platform Contributors. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import type { Person } from '@hcengineering/contact' +import type { Ref, Timestamp } from '@hcengineering/core' + +export interface PresenceTyping { + person: Ref + lastTyping: Timestamp +} diff --git a/plugins/presence-resources/.eslintrc.js b/plugins/presence-resources/.eslintrc.js new file mode 100644 index 00000000000..bb8fd7450d4 --- /dev/null +++ b/plugins/presence-resources/.eslintrc.js @@ -0,0 +1,4 @@ +module.exports = { + extends: ['./node_modules/@hcengineering/platform-rig/profiles/ui/eslint.config.json'], + parserOptions: { tsconfigRootDir: __dirname } +} diff --git a/plugins/presence-resources/.prettierrc b/plugins/presence-resources/.prettierrc new file mode 100644 index 00000000000..792942803ac --- /dev/null +++ b/plugins/presence-resources/.prettierrc @@ -0,0 +1,22 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#", + "trailingComma": "none", + "tabWidth": 2, + "semi": false, + "singleQuote": true, + "printWidth": 120, + "useTabs": false, + "bracketSpacing": true, + "proseWrap": "preserve", + "plugins": [ + "prettier-plugin-svelte" + ], + "overrides": [ + { + "files": "*.svelte", + "options": { + "parser": "svelte" + } + } + ] +} \ No newline at end of file diff --git a/plugins/presence-resources/config/rig.json b/plugins/presence-resources/config/rig.json new file mode 100644 index 00000000000..bcad6f7c33b --- /dev/null +++ b/plugins/presence-resources/config/rig.json @@ -0,0 +1,5 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + "rigPackageName": "@hcengineering/platform-rig", + "rigProfile": "ui" +} diff --git a/plugins/presence-resources/jest.config.js b/plugins/presence-resources/jest.config.js new file mode 100644 index 00000000000..3656e284d33 --- /dev/null +++ b/plugins/presence-resources/jest.config.js @@ -0,0 +1,5 @@ +module.exports = { + preset: 'ts-jest', + testEnvironment: 'node', + testMatch: ['**/?(*.)+(spec|test).[jt]s?(x)'] +} diff --git a/plugins/presence-resources/package.json b/plugins/presence-resources/package.json new file mode 100644 index 00000000000..3b0c799f18d --- /dev/null +++ b/plugins/presence-resources/package.json @@ -0,0 +1,54 @@ +{ + "name": "@hcengineering/presence-resources", + "version": "0.6.0", + "main": "src/index.ts", + "author": "Hardcore Engineering Inc.", + "license": "EPL-2.0", + "scripts": { + "build": "compile ui", + "build:docs": "api-extractor run --local", + "format": "format src", + "svelte-check": "do-svelte-check", + "_phase:svelte-check": "do-svelte-check", + "build:watch": "compile ui", + "_phase:build": "compile ui", + "_phase:format": "format src", + "_phase:validate": "compile validate" + }, + "devDependencies": { + "svelte-loader": "^3.2.0", + "sass": "^1.53.0", + "svelte-preprocess": "^5.1.3", + "@hcengineering/platform-rig": "^0.6.0", + "@typescript-eslint/eslint-plugin": "^6.11.0", + "@typescript-eslint/parser": "^6.11.0", + "eslint-config-standard-with-typescript": "^40.0.0", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-n": "^15.4.0", + "eslint-plugin-promise": "^6.1.1", + "eslint-plugin-svelte": "^2.35.1", + "prettier-plugin-svelte": "^3.2.2", + "eslint": "^8.54.0", + "prettier": "^3.1.0", + "svelte-check": "^3.6.9", + "typescript": "^5.3.3", + "jest": "^29.7.0", + "ts-jest": "^29.1.1", + "@types/jest": "^29.5.5", + "svelte-eslint-parser": "^0.33.1" + }, + "dependencies": { + "@hcengineering/platform": "^0.6.11", + "@hcengineering/core": "^0.6.32", + "@hcengineering/presentation": "^0.6.3", + "@hcengineering/theme": "^0.6.5", + "@hcengineering/ui": "^0.6.15", + "@hcengineering/view": "^0.6.13", + "@hcengineering/view-resources": "^0.6.0", + "@hcengineering/contact": "^0.6.24", + "@hcengineering/contact-resources": "^0.6.0", + "@hcengineering/presence": "^0.6.0", + "svelte": "^4.2.19", + "fast-equals": "^5.0.1" + } +} diff --git a/plugins/presence-resources/postcss.config.js b/plugins/presence-resources/postcss.config.js new file mode 100644 index 00000000000..88752c6cb06 --- /dev/null +++ b/plugins/presence-resources/postcss.config.js @@ -0,0 +1,5 @@ +module.exports = { + plugins: [ + require('autoprefixer') + ] +} diff --git a/plugins/presence-resources/src/client.ts b/plugins/presence-resources/src/client.ts new file mode 100644 index 00000000000..64337d265ae --- /dev/null +++ b/plugins/presence-resources/src/client.ts @@ -0,0 +1,174 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { type Ref, concatLink, getCurrentAccount } from '@hcengineering/core' +import { type Person, type PersonAccount } from '@hcengineering/contact' +import { getMetadata } from '@hcengineering/platform' +import presence from '@hcengineering/presence' +import presentation from '@hcengineering/presentation' +import { type Unsubscriber, get } from 'svelte/store' + +import { myPresence, onPersonUpdate, onPersonLeave } from './store' +import { type RoomPresence } from './types' + +interface Message { + id: Ref + type: 'update' | 'remove' + presence?: RoomPresence[] + lastUpdate?: number +} + +export class PresenceClient implements Disposable { + private ws: WebSocket | null = null + private closed = false + private reconnectTimeout: number | undefined + private readonly reconnectInterval = 1000 + + private presence: RoomPresence[] + private readonly myPresenceUnsub: Unsubscriber + + constructor (private readonly url: string | URL) { + this.presence = get(myPresence) + this.myPresenceUnsub = myPresence.subscribe((presence) => { + this.handlePresenceChanged(presence) + }) + + this.connect() + } + + close (): void { + this.closed = true + clearTimeout(this.reconnectTimeout) + + this.myPresenceUnsub() + + if (this.ws !== null) { + this.ws.close() + this.ws = null + } + } + + private connect (): void { + try { + const ws = new WebSocket(this.url) + this.ws = ws + + ws.onopen = () => { + if (this.ws !== ws) { + return + } + + this.handleConnect() + } + + ws.onclose = (event: CloseEvent) => { + if (this.ws !== ws) { + ws.close() + return + } + + this.reconnect() + } + + ws.onmessage = (event: MessageEvent) => { + if (this.closed || this.ws !== ws) { + return + } + + this.handleMessage(event.data) + } + + ws.onerror = (event: Event) => { + if (this.ws !== ws) { + return + } + + console.log('client websocket error', event) + } + } catch (err: any) { + this.reconnect() + } + } + + private reconnect (): void { + clearTimeout(this.reconnectTimeout) + + if (!this.closed) { + this.reconnectTimeout = window.setTimeout(() => { + this.connect() + }, this.reconnectInterval) + } + } + + private handleConnect (): void { + const me = getCurrentAccount() as PersonAccount + this.sendPresence(me.person, this.presence) + } + + private handleMessage (data: string): void { + try { + const message = JSON.parse(data) as Message + if (message.type === 'update' && message.presence !== undefined) { + onPersonUpdate(message.id, message.presence ?? []) + } else if (message.type === 'remove') { + onPersonLeave(message.id) + } else { + console.warn('Unknown message type', message) + } + } catch (err: any) { + console.error('Error parsing message', err, data) + } + } + + private handlePresenceChanged (presence: RoomPresence[]): void { + const me = getCurrentAccount() as PersonAccount + this.presence = presence + this.sendPresence(me.person, this.presence) + } + + private sendPresence (person: Ref, presence: RoomPresence[]): void { + if (!this.closed && this.ws !== null && this.ws.readyState === WebSocket.OPEN) { + const message: Message = { id: person, type: 'update', presence } + this.ws.send(JSON.stringify(message)) + } + } + + [Symbol.dispose] (): void { + this.close() + } +} + +export function connect (): PresenceClient | undefined { + const workspaceId = getMetadata(presentation.metadata.WorkspaceId) + if (workspaceId === undefined) { + console.warn('Workspace ID is not defined') + return undefined + } + + const token = getMetadata(presentation.metadata.Token) + + const presenceUrl = getMetadata(presence.metadata.PresenceUrl) + if (presenceUrl === undefined || presenceUrl === '') { + console.warn('Presence URL is not defined') + return undefined + } + + const url = new URL(concatLink(presenceUrl, workspaceId)) + if (token !== undefined) { + url.searchParams.set('token', token) + } + + return new PresenceClient(url) +} diff --git a/plugins/presence-resources/src/components/Presence.svelte b/plugins/presence-resources/src/components/Presence.svelte new file mode 100644 index 00000000000..3d3b52d1831 --- /dev/null +++ b/plugins/presence-resources/src/components/Presence.svelte @@ -0,0 +1,26 @@ + + + + +{#key object._id} + +{/key} diff --git a/plugins/presence-resources/src/components/PresenceAvatars.svelte b/plugins/presence-resources/src/components/PresenceAvatars.svelte new file mode 100644 index 00000000000..4708b5e0792 --- /dev/null +++ b/plugins/presence-resources/src/components/PresenceAvatars.svelte @@ -0,0 +1,50 @@ + + + + +{#if items.length > 0} + {#if combine} + + {:else} +
+ {#each items as item} + {@const person = $personByIdStore.get(item)} + {#if person} +
+ +
+ {/if} + {/each} +
+ {/if} +{/if} diff --git a/plugins/presence-resources/src/components/PresenceContext.svelte b/plugins/presence-resources/src/components/PresenceContext.svelte new file mode 100644 index 00000000000..e46985ce17a --- /dev/null +++ b/plugins/presence-resources/src/components/PresenceContext.svelte @@ -0,0 +1,33 @@ + + + + + diff --git a/plugins/presence-resources/src/components/WorkbenchExtension.svelte b/plugins/presence-resources/src/components/WorkbenchExtension.svelte new file mode 100644 index 00000000000..1e93be67ae3 --- /dev/null +++ b/plugins/presence-resources/src/components/WorkbenchExtension.svelte @@ -0,0 +1,18 @@ + + + diff --git a/plugins/presence-resources/src/index.ts b/plugins/presence-resources/src/index.ts new file mode 100644 index 00000000000..36267812821 --- /dev/null +++ b/plugins/presence-resources/src/index.ts @@ -0,0 +1,33 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { type Resources } from '@hcengineering/platform' + +import Presence from './components/Presence.svelte' +import PresenceAvatars from './components/PresenceAvatars.svelte' +import WorkbenchExtension from './components/WorkbenchExtension.svelte' + +export { Presence, PresenceAvatars } +export { updateMyPresence, removeMyPresence, presenceByObjectId } from './store' + +export * from './types' + +export default async (): Promise => ({ + component: { + Presence, + PresenceAvatars, + WorkbenchExtension + } +}) diff --git a/plugins/presence-resources/src/plugin.ts b/plugins/presence-resources/src/plugin.ts new file mode 100644 index 00000000000..46bf751265e --- /dev/null +++ b/plugins/presence-resources/src/plugin.ts @@ -0,0 +1,19 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { mergeIds } from '@hcengineering/platform' +import presence, { presenceId } from '@hcengineering/presence' + +export default mergeIds(presenceId, presence, {}) diff --git a/plugins/presence-resources/src/store.ts b/plugins/presence-resources/src/store.ts new file mode 100644 index 00000000000..0888983c5af --- /dev/null +++ b/plugins/presence-resources/src/store.ts @@ -0,0 +1,81 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { type Doc, type Ref, getCurrentAccount } from '@hcengineering/core' +import { type Person, type PersonAccount } from '@hcengineering/contact' +import { type PresenceData } from '@hcengineering/presence' +import { type Readable, derived, writable } from 'svelte/store' + +import { type PersonRoomPresence, type Room, type RoomPresence } from './types' + +type PersonPresenceMap = Map, RoomPresence[]> + +export const myPresence = writable([]) +export const otherPresence = writable(new Map()) + +export const presenceByObjectId = derived, Map, PersonRoomPresence[]>>( + otherPresence, + ($presence) => { + const me = getCurrentAccount() as PersonAccount + const map = new Map, PersonRoomPresence[]>() + for (const [person, presences] of $presence.entries()) { + if (person === me.person) continue + + presences.forEach((presence) => { + const values = map.get(presence.room.objectId) ?? [] + values.push({ person, ...presence }) + + map.set(presence.room.objectId, values) + }) + } + + return map + } +) + +export function updateMyPresence (room: Room, presence: PresenceData): void { + myPresence.update((rooms) => { + const value = { room, presence, lastUpdated: Date.now() } + + const index = rooms.findIndex((it) => it.room.objectId === room.objectId) + if (index >= 0) { + rooms[index] = value + } else { + rooms.push(value) + } + + return rooms + }) +} + +export function removeMyPresence (room: Room): void { + myPresence.update((old) => { + return old.filter((it) => it.room.objectId !== room.objectId) + }) +} + +export function onPersonUpdate (person: Ref, presence: RoomPresence[]): void { + otherPresence.update((map) => { + map.set(person, [...presence]) + return map + }) +} + +export function onPersonLeave (person: Ref): void { + otherPresence.update((map) => { + map.delete(person) + return map + }) +} diff --git a/plugins/presence-resources/src/types.ts b/plugins/presence-resources/src/types.ts new file mode 100644 index 00000000000..5dc5bbb6441 --- /dev/null +++ b/plugins/presence-resources/src/types.ts @@ -0,0 +1,42 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { type Class, type Doc, type Ref } from '@hcengineering/core' +import { type Person } from '@hcengineering/contact' +import { type PresenceData } from '@hcengineering/presence' + +export interface Room { + objectId: Ref + objectClass: Ref> +} + +export interface RoomPresence { + room: Room + presence: PresenceData + lastUpdated: number +} + +export interface PersonRoomPresence { + person: Ref + room: Room + presence: PresenceData + lastUpdated: number +} + +export interface PersonPresence { + person: Ref + presence: RoomPresence[] + lastUpdated: number +} diff --git a/plugins/presence-resources/svelte.config.js b/plugins/presence-resources/svelte.config.js new file mode 100644 index 00000000000..944a06f73ee --- /dev/null +++ b/plugins/presence-resources/svelte.config.js @@ -0,0 +1,5 @@ +const sveltePreprocess = require('svelte-preprocess') + +module.exports = { + preprocess: sveltePreprocess() +}; \ No newline at end of file diff --git a/plugins/presence-resources/tsconfig.json b/plugins/presence-resources/tsconfig.json new file mode 100644 index 00000000000..fb6ccb2d182 --- /dev/null +++ b/plugins/presence-resources/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "./node_modules/@hcengineering/platform-rig/profiles/ui/tsconfig.json", + + "compilerOptions": { + "rootDir": "./src", + "outDir": "./lib", + "declarationDir": "./types" + } +} \ No newline at end of file diff --git a/plugins/presence/.eslintrc.js b/plugins/presence/.eslintrc.js new file mode 100644 index 00000000000..72235dc2833 --- /dev/null +++ b/plugins/presence/.eslintrc.js @@ -0,0 +1,7 @@ +module.exports = { + extends: ['./node_modules/@hcengineering/platform-rig/profiles/default/eslint.config.json'], + parserOptions: { + tsconfigRootDir: __dirname, + project: './tsconfig.json' + } +} diff --git a/plugins/presence/.npmignore b/plugins/presence/.npmignore new file mode 100644 index 00000000000..e3ec093c383 --- /dev/null +++ b/plugins/presence/.npmignore @@ -0,0 +1,4 @@ +* +!/lib/** +!CHANGELOG.md +/lib/**/__tests__/ diff --git a/plugins/presence/config/rig.json b/plugins/presence/config/rig.json new file mode 100644 index 00000000000..0110930f55e --- /dev/null +++ b/plugins/presence/config/rig.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json", + "rigPackageName": "@hcengineering/platform-rig" +} diff --git a/plugins/presence/jest.config.js b/plugins/presence/jest.config.js new file mode 100644 index 00000000000..2cfd408b679 --- /dev/null +++ b/plugins/presence/jest.config.js @@ -0,0 +1,7 @@ +module.exports = { + preset: 'ts-jest', + testEnvironment: 'node', + testMatch: ['**/?(*.)+(spec|test).[jt]s?(x)'], + roots: ["./src"], + coverageReporters: ["text-summary", "html"] +} diff --git a/plugins/presence/package.json b/plugins/presence/package.json new file mode 100644 index 00000000000..5a02e0356c4 --- /dev/null +++ b/plugins/presence/package.json @@ -0,0 +1,48 @@ +{ + "name": "@hcengineering/presence", + "version": "0.6.0", + "main": "lib/index.js", + "svelte": "src/index.ts", + "types": "types/index.d.ts", + "files": [ + "lib/**/*", + "types/**/*", + "tsconfig.json" + ], + "author": "Hardcore Engineering Inc.", + "license": "EPL-2.0", + "scripts": { + "build": "compile", + "build:watch": "compile", + "format": "format src", + "test": "jest --passWithNoTests --silent", + "_phase:build": "compile transpile src", + "_phase:test": "jest --passWithNoTests --silent", + "_phase:format": "format src", + "_phase:validate": "compile validate" + }, + "devDependencies": { + "@hcengineering/platform-rig": "^0.6.0", + "@typescript-eslint/eslint-plugin": "^6.11.0", + "@typescript-eslint/parser": "^6.11.0", + "eslint-config-standard-with-typescript": "^40.0.0", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-n": "^15.4.0", + "eslint-plugin-promise": "^6.1.1", + "eslint": "^8.54.0", + "prettier": "^3.1.0", + "typescript": "^5.3.3", + "jest": "^29.7.0", + "ts-jest": "^29.1.1", + "@types/jest": "^29.5.5" + }, + "dependencies": { + "@hcengineering/platform": "^0.6.11", + "@hcengineering/core": "^0.6.32", + "@hcengineering/ui": "^0.6.15" + }, + "repository": "https://github.com/hcengineering/platform", + "publishConfig": { + "registry": "https://npm.pkg.github.com" + } +} diff --git a/plugins/presence/src/index.ts b/plugins/presence/src/index.ts new file mode 100644 index 00000000000..06c114f9ae1 --- /dev/null +++ b/plugins/presence/src/index.ts @@ -0,0 +1,21 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import { presenceId, presencePlugin } from './plugin' + +export * from './types' + +export { presenceId } +export default presencePlugin diff --git a/plugins/presence/src/plugin.ts b/plugins/presence/src/plugin.ts new file mode 100644 index 00000000000..7f50ca851a0 --- /dev/null +++ b/plugins/presence/src/plugin.ts @@ -0,0 +1,33 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import type { Metadata, Plugin } from '@hcengineering/platform' +import { plugin } from '@hcengineering/platform' +import { AnyComponent } from '@hcengineering/ui' + +/** @public */ +export const presenceId = 'presence' as Plugin + +export const presencePlugin = plugin(presenceId, { + metadata: { + PresenceUrl: '' as Metadata + }, + component: { + Presence: '' as AnyComponent, + PresenceAvatars: '' as AnyComponent + } +}) + +export default presencePlugin diff --git a/plugins/presence/src/types.ts b/plugins/presence/src/types.ts new file mode 100644 index 00000000000..07aa16820f0 --- /dev/null +++ b/plugins/presence/src/types.ts @@ -0,0 +1,16 @@ +// +// Copyright © 2024 Hardcore Engineering Inc. +// +// Licensed under the Eclipse Public License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. You may +// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +export type PresenceData = Record diff --git a/plugins/presence/tsconfig.json b/plugins/presence/tsconfig.json new file mode 100644 index 00000000000..59e4fd42978 --- /dev/null +++ b/plugins/presence/tsconfig.json @@ -0,0 +1,10 @@ +{ + "extends": "./node_modules/@hcengineering/platform-rig/profiles/default/tsconfig.json", + + "compilerOptions": { + "rootDir": "./src", + "outDir": "./lib", + "declarationDir": "./types", + "tsBuildInfoFile": ".build/build.tsbuildinfo" + } +} \ No newline at end of file diff --git a/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte b/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte index 1e02acb4556..86c18ab186c 100644 --- a/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte +++ b/plugins/text-editor-resources/src/components/CollaborativeTextEditor.svelte @@ -71,7 +71,6 @@ } from '@hcengineering/text-editor' import { addTableHandler } from '../utils' - import CollaborationUsers from './CollaborationUsers.svelte' import TextEditorToolbar from './TextEditorToolbar.svelte' import { noSelectionRender, renderCursor } from './editor/collaboration' import { defaultEditorAttributes } from './editor/editorProps' @@ -584,11 +583,11 @@
-
+
{#if refActions.length > 0} diff --git a/pods/front/src/__start.ts b/pods/front/src/__start.ts index 2718d0f739d..3a691438d0c 100644 --- a/pods/front/src/__start.ts +++ b/pods/front/src/__start.ts @@ -37,6 +37,7 @@ startFront(metricsContext, { LOVE_ENDPOINT: process.env.LOVE_ENDPOINT ?? '', SIGN_URL: process.env.SIGN_URL ?? '', PRINT_URL: process.env.PRINT_URL ?? '', + PRESENCE_URL: process.env.PRESENCE_URL ?? '', PUSH_PUBLIC_KEY: process.env.PUSH_PUBLIC_KEY ?? '', POSTHOG_API_KEY: process.env.POSTHOG_API_KEY, POSTHOG_HOST: process.env.POSTHOG_HOST, diff --git a/rush.json b/rush.json index 80b75f0cc33..d167db3568b 100644 --- a/rush.json +++ b/rush.json @@ -510,6 +510,21 @@ "projectFolder": "models/uploader", "shouldPublish": false }, + { + "packageName": "@hcengineering/presence", + "projectFolder": "plugins/presence", + "shouldPublish": false + }, + { + "packageName": "@hcengineering/presence-resources", + "projectFolder": "plugins/presence-resources", + "shouldPublish": false + }, + { + "packageName": "@hcengineering/model-presence", + "projectFolder": "models/presence", + "shouldPublish": false + }, { "packageName": "@hcengineering/collaborator-client", "projectFolder": "packages/collaborator-client",