Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New chat & inbox #8328

Merged
merged 27 commits into from
Mar 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1d1b61c
Add communication api on server and add separate client (#7949)
kristina-fefelova Mar 11, 2025
e0cc36e
Merge branch 'develop' into feature/new-chat
kristina-fefelova Mar 11, 2025
57df04a
Update communication
kristina-fefelova Mar 11, 2025
3d6cd1e
Init new chat ui (#8106)
kristina-fefelova Mar 11, 2025
49ea785
Merge branch 'develop' into feature/new-chat
kristina-fefelova Mar 13, 2025
ba10ef9
Update branch
kristina-fefelova Mar 13, 2025
05f8d12
Merge develop
kristina-fefelova Mar 20, 2025
0ee0a83
Fix desktop version
kristina-fefelova Mar 20, 2025
c59fd61
Update branch
kristina-fefelova Mar 23, 2025
b598d6a
Update communication
kristina-fefelova Mar 23, 2025
110e631
Update communication
kristina-fefelova Mar 23, 2025
d7ef8b4
[Part-1] Init msg2file service (#8322)
kristina-fefelova Mar 24, 2025
47a29fc
[Part-2] Init inbox and notifications , support attachments (#8323) …
kristina-fefelova Mar 24, 2025
72b994d
Add new activity for cards (#8326)
kristina-fefelova Mar 24, 2025
69509b9
[Part-4]: Fix bugs in new chat and inbox (#8327)
kristina-fefelova Mar 25, 2025
36fe720
Add github token
kristina-fefelova Mar 25, 2025
976fd89
Add github token for all jobs
kristina-fefelova Mar 25, 2025
a9c9280
Add new inbox to desktop
kristina-fefelova Mar 25, 2025
3467d84
Fix jest config
kristina-fefelova Mar 25, 2025
37d906c
Fix rig.json
kristina-fefelova Mar 25, 2025
3d1f580
Merge branch 'develop' into feature/new-chat
kristina-fefelova Mar 25, 2025
b13c29f
Merge branch 'develop' into feature/new-chat
kristina-fefelova Mar 25, 2025
eafea8d
Fix inbox locator
kristina-fefelova Mar 25, 2025
6d020d0
Merge develop
kristina-fefelova Mar 25, 2025
c203fde
Merge branch 'develop' into feature/new-chat
kristina-fefelova Mar 26, 2025
b39c926
Merge develop
kristina-fefelova Mar 31, 2025
ed742b9
Merge branch 'develop' into feature/new-chat
kristina-fefelova Mar 31, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ jobs:
- name: Checking for mis-matching dependencies...
run: node common/scripts/install-run-rush.js check

- name: Prepare .npmrc for GitHub Packages
run: |
echo "//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}" > ~/.npmrc

- name: Installing...
run: node common/scripts/install-run-rush.js install

Expand Down Expand Up @@ -226,6 +230,10 @@ jobs:
- name: Checking for mis-matching dependencies...
run: node common/scripts/install-run-rush.js check

- name: Prepare .npmrc for GitHub Packages
run: |
echo "//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}" > ~/.npmrc

- name: Installing...
run: node common/scripts/install-run-rush.js install

Expand Down Expand Up @@ -350,6 +358,10 @@ jobs:
- name: Checking for mis-matching dependencies...
run: node common/scripts/install-run-rush.js check

- name: Prepare .npmrc for GitHub Packages
run: |
echo "//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}" > ~/.npmrc

- name: Installing...
run: node common/scripts/install-run-rush.js install

Expand Down Expand Up @@ -423,6 +435,10 @@ jobs:
- name: Checking for mis-matching dependencies...
run: node common/scripts/install-run-rush.js check

- name: Prepare .npmrc for GitHub Packages
run: |
echo "//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}" > ~/.npmrc

- name: Installing...
run: node common/scripts/install-run-rush.js install

Expand Down Expand Up @@ -495,6 +511,10 @@ jobs:
- name: Checking for mis-matching dependencies...
run: node common/scripts/install-run-rush.js check

- name: Prepare .npmrc for GitHub Packages
run: |
echo "//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}" > ~/.npmrc

- name: Installing...
run: node common/scripts/install-run-rush.js install

Expand Down Expand Up @@ -595,6 +615,10 @@ jobs:
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Prepare .npmrc for GitHub Packages
run: |
echo "//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}" > ~/.npmrc

- name: Installing...
run: node common/scripts/install-run-rush.js install

Expand Down Expand Up @@ -668,6 +692,10 @@ jobs:
restore-keys: |
${{ runner.os }}-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}

- name: Prepare .npmrc for GitHub Packages
run: |
echo "//npm.pkg.github.com/:_authToken=${{secrets.GITHUB_TOKEN}}" > ~/.npmrc

- name: Installing...
run: node common/scripts/install-run-rush.js install --purge
- name: Model version from git tags
Expand Down
19 changes: 19 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -868,6 +868,25 @@
"runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
"sourceMaps": true,
"cwd": "${workspaceRoot}/services/export/pod-export"
},
{
"name": "Msg2File",
"type": "node",
"request": "launch",
"args": ["src/index.ts"],
"env": {
"ACCOUNTS_URL": "http://localhost:3000",
"DB_URL": "postgresql://root@localhost:26257/defaultdb?sslmode=disable",
"PORT": "9087",
"SECRET": "secret",
"SERVICE_ID": "msg2file-service",
"STORAGE_CONFIG": "minio|localhost?accessKey=minioadmin&secretKey=minioadmin"
},
"runtimeVersion": "20",
"runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
"sourceMaps": true,
"outputCapture": "std",
"cwd": "${workspaceRoot}/services/msg2file"
}
]
}
1 change: 1 addition & 0 deletions common/config/rush/.npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
# //registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}
#
registry=https://registry.npmjs.org/
@hcengineering:registry=https://npm.pkg.github.com
always-auth=false
677 changes: 664 additions & 13 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
"dependencies": {
"@hcengineering/platform": "^0.6.11",
"@hcengineering/ui": "^0.6.15",
"@hcengineering/ui-next": "^0.6.0",
"@hcengineering/theme": "^0.6.5",
"@hcengineering/login": "^0.6.12",
"@hcengineering/login-assets": "^0.6.0",
Expand Down Expand Up @@ -230,6 +231,12 @@
"@hcengineering/mail": "^0.6.0",
"@hcengineering/mail-assets": "^0.6.0",
"@hcengineering/mail-resources": "^0.6.0",
"@hcengineering/chat": "^0.6.0",
"@hcengineering/chat-assets": "^0.6.0",
"@hcengineering/chat-resources": "^0.6.0",
"@hcengineering/inbox": "^0.6.0",
"@hcengineering/inbox-assets": "^0.6.0",
"@hcengineering/inbox-resources": "^0.6.0",
"electron-squirrel-startup": "~1.0.0",
"dotenv": "~16.0.0",
"electron-context-menu": "^4.0.4",
Expand Down
10 changes: 10 additions & 0 deletions desktop/src/ui/platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,15 @@ import { timeId } from '@hcengineering/time'
import tracker, { trackerId } from '@hcengineering/tracker'
import { trainingId } from '@hcengineering/training'
import uiPlugin, { getCurrentLocation, locationStorageKeyId, navigate, setLocationStorageKey } from '@hcengineering/ui'
import { uiNextId } from '@hcengineering/ui-next'
import { uploaderId } from '@hcengineering/uploader'
import recorder, { recorderId } from '@hcengineering/recorder'
import { viewId } from '@hcengineering/view'
import workbench, { workbenchId } from '@hcengineering/workbench'
import { mySpaceId } from '@hcengineering/my-space'
import { mailId } from '@hcengineering/mail'
import { chatId } from '@hcengineering/chat'
import { inboxId } from '@hcengineering/inbox'

import '@hcengineering/activity-assets'
import '@hcengineering/analytics-collector-assets'
Expand Down Expand Up @@ -109,6 +112,8 @@ import '@hcengineering/uploader-assets'
import '@hcengineering/view-assets'
import '@hcengineering/workbench-assets'
import '@hcengineering/mail-assets'
import '@hcengineering/chat-assets'
import '@hcengineering/inbox-assets'

import analyticsCollector, { analyticsCollectorId } from '@hcengineering/analytics-collector'
import { coreId } from '@hcengineering/core'
Expand Down Expand Up @@ -147,6 +152,7 @@ function configureI18n (): void {
)
addStringsLoader(textEditorId, async (lang: string) => await import(`@hcengineering/text-editor-assets/lang/${lang}.json`))
addStringsLoader(uiId, async (lang: string) => await import(`@hcengineering/ui/lang/${lang}.json`))
addStringsLoader(uiNextId, async (lang: string) => await import(`@hcengineering/ui-next/lang/${lang}.json`))
addStringsLoader(uploaderId, async (lang: string) => await import(`@hcengineering/uploader-assets/lang/${lang}.json`))
addStringsLoader(recorderId, async (lang: string) => await import(`@hcengineering/recorder-assets/lang/${lang}.json`))
addStringsLoader(activityId, async (lang: string) => await import(`@hcengineering/activity-assets/lang/${lang}.json`))
Expand Down Expand Up @@ -217,6 +223,8 @@ function configureI18n (): void {
addStringsLoader(cardId, async (lang: string) => await import(`@hcengineering/card-assets/lang/${lang}.json`))
addStringsLoader(mySpaceId, async (lang: string) => await import(`@hcengineering/my-space-assets/lang/${lang}.json`))
addStringsLoader(mailId, async (lang: string) => await import(`@hcengineering/mail-assets/lang/${lang}.json`))
addStringsLoader(chatId, async (lang: string) => await import(`@hcengineering/chat-assets/lang/${lang}.json`))
addStringsLoader(inboxId, async (lang: string) => await import(`@hcengineering/inbox-assets/lang/${lang}.json`))
addStringsLoader(processId, async (lang: string) => await import(`@hcengineering/process-assets/lang/${lang}.json`))
}

Expand Down Expand Up @@ -351,6 +359,8 @@ export async function configurePlatform (): Promise<void> {
addLocation(surveyId, () => import(/* webpackChunkName: "survey" */ '@hcengineering/survey-resources'))
addLocation(cardId, () => import(/* webpackChunkName: "card" */ '@hcengineering/card-resources'))
addLocation(mySpaceId, () => import(/* webpackChunkName: "card" */ '@hcengineering/my-space-resources'))
addLocation(chatId, () => import(/* webpackChunkName: "chat" */ '@hcengineering/chat-resources'))
addLocation(inboxId, () => import(/* webpackChunkName: "inbox" */ '@hcengineering/inbox-resources'))
addLocation(processId, () => import(/* webpackChunkName: "process" */ '@hcengineering/process-resources'))

setMetadata(client.metadata.FilterModel, 'ui')
Expand Down
36 changes: 18 additions & 18 deletions dev/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,8 @@ services:
- LAST_NAME_FIRST=true
- BRANDING_PATH=/var/cfg/branding.json
- AI_BOT_URL=http://huly.local:4010
- MSG2FILE_URL=http://huly.local:9087
- COMMUNICATION_TIME_LOGGING_ENABLED=true
restart: unless-stopped
rekoni:
image: hardcoreeng/rekoni-service
Expand Down Expand Up @@ -471,24 +473,22 @@ services:
- AVATAR_PATH=./avatar.png
- AVATAR_CONTENT_TYPE=.png
- STATS_URL=http://huly.local:4900
# - LOVE_ENDPOINT=http://huly.local:8096
# - OPENAI_API_KEY=token
# telegram-bot:
# image: hardcoreeng/telegram-bot
# extra_hosts:
# - "huly.local:host-gateway"
# restart: unless-stopped
# environment:
# - PORT=4020
# - QUEUE_CONFIG=${QUEUE_CONFIG}
# - BOT_TOKEN=token
# - MONGO_URL=${MONGO_URL}
# - MONGO_DB=telegram-bot
# - SECRET=secret
# - DOMAIN=domain
# - ACCOUNTS_URL=http://huly.local:3000
# - SERVICE_ID=telegram-bot-service
# - STATS_URL=http://huly.local:4900
# - LOVE_ENDPOINT=http://huly.local:8096
# - OPENAI_API_KEY=token
msg2file:
image: hardcoreeng/msg2file
ports:
- 9087:9087
extra_hosts:
- 'huly.local:host-gateway'
restart: unless-stopped
environment:
- ACCOUNTS_URL=http://huly.local:3000
- DB_URL=postgresql://[email protected]:26257/defaultdb?sslmode=disable
- PORT=9087
- SECRET=secret
- SERVICE_ID=msg2file-service
- STORAGE_CONFIG=${STORAGE_CONFIG}
export:
image: hardcoreeng/export
extra_hosts:
Expand Down
69 changes: 38 additions & 31 deletions dev/prod/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@
"@hcengineering/card": "^0.6.0",
"@hcengineering/card-assets": "^0.6.0",
"@hcengineering/card-resources": "^0.6.0",
"@hcengineering/chat": "^0.6.0",
"@hcengineering/chat-assets": "^0.6.0",
"@hcengineering/chat-resources": "^0.6.0",
"@hcengineering/inbox": "^0.6.0",
"@hcengineering/inbox-assets": "^0.6.0",
"@hcengineering/inbox-resources": "^0.6.0",
"@hcengineering/chunter": "^0.6.20",
"@hcengineering/chunter-assets": "^0.6.18",
"@hcengineering/chunter-resources": "^0.6.0",
Expand Down Expand Up @@ -124,28 +130,6 @@
"@hcengineering/inventory": "^0.6.11",
"@hcengineering/inventory-assets": "^0.6.11",
"@hcengineering/inventory-resources": "^0.6.0",
"@hcengineering/templates": "^0.6.11",
"@hcengineering/templates-assets": "^0.6.11",
"@hcengineering/templates-resources": "^0.6.0",
"@hcengineering/notification": "^0.6.23",
"@hcengineering/notification-assets": "^0.6.17",
"@hcengineering/notification-resources": "^0.6.0",
"@hcengineering/preference": "^0.6.13",
"@hcengineering/preference-assets": "^0.6.0",
"@hcengineering/rekoni": "^0.6.0",
"@hcengineering/tags-assets": "^0.6.0",
"@hcengineering/tags": "^0.6.16",
"@hcengineering/tags-resources": "^0.6.0",
"@hcengineering/presentation": "^0.6.3",
"@hcengineering/tracker": "^0.6.24",
"@hcengineering/tracker-assets": "^0.6.0",
"@hcengineering/tracker-resources": "^0.6.0",
"@hcengineering/text-editor": "^0.6.0",
"@hcengineering/text-editor-assets": "^0.6.0",
"@hcengineering/text-editor-resources": "^0.6.0",
"@hcengineering/request": "^0.6.14",
"@hcengineering/request-assets": "^0.6.0",
"@hcengineering/request-resources": "^0.6.0",
"@hcengineering/lead": "^0.6.0",
"@hcengineering/lead-assets": "^0.6.0",
"@hcengineering/lead-resources": "^0.6.0",
Expand All @@ -155,12 +139,24 @@
"@hcengineering/love": "^0.6.0",
"@hcengineering/love-assets": "^0.6.0",
"@hcengineering/love-resources": "^0.6.0",
"@hcengineering/mail": "^0.6.0",
"@hcengineering/mail-assets": "^0.6.0",
"@hcengineering/mail-resources": "^0.6.0",
"@hcengineering/my-space": "^0.6.0",
"@hcengineering/my-space-assets": "^0.6.0",
"@hcengineering/my-space-resources": "^0.6.0",
"@hcengineering/notification": "^0.6.23",
"@hcengineering/notification-assets": "^0.6.17",
"@hcengineering/notification-resources": "^0.6.0",
"@hcengineering/onboard": "^0.6.0",
"@hcengineering/onboard-assets": "^0.6.0",
"@hcengineering/onboard-resources": "^0.6.0",
"@hcengineering/platform": "^0.6.11",
"@hcengineering/preference": "^0.6.13",
"@hcengineering/preference-assets": "^0.6.0",
"@hcengineering/presence": "^0.6.0",
"@hcengineering/presence-resources": "^0.6.0",
"@hcengineering/presentation": "^0.6.3",
"@hcengineering/print": "^0.6.0",
"@hcengineering/print-assets": "^0.6.0",
"@hcengineering/print-resources": "^0.6.0",
Expand All @@ -170,9 +166,16 @@
"@hcengineering/questions": "^0.1.0",
"@hcengineering/questions-assets": "^0.1.0",
"@hcengineering/questions-resources": "^0.1.0",
"@hcengineering/recorder": "^0.6.0",
"@hcengineering/recorder-assets": "^0.6.0",
"@hcengineering/recorder-resources": "^0.6.0",
"@hcengineering/recruit": "^0.6.29",
"@hcengineering/recruit-assets": "^0.6.23",
"@hcengineering/recruit-resources": "^0.6.0",
"@hcengineering/rekoni": "^0.6.0",
"@hcengineering/request": "^0.6.14",
"@hcengineering/request-assets": "^0.6.0",
"@hcengineering/request-resources": "^0.6.0",
"@hcengineering/server-activity": "^0.6.0",
"@hcengineering/server-activity-resources": "^0.6.0",
"@hcengineering/server-attachment": "^0.6.1",
Expand Down Expand Up @@ -223,35 +226,39 @@
"@hcengineering/survey": "^0.6.0",
"@hcengineering/survey-assets": "^0.6.0",
"@hcengineering/survey-resources": "^0.6.0",
"@hcengineering/my-space": "^0.6.0",
"@hcengineering/my-space-assets": "^0.6.0",
"@hcengineering/my-space-resources": "^0.6.0",
"@hcengineering/mail": "^0.6.0",
"@hcengineering/mail-assets": "^0.6.0",
"@hcengineering/mail-resources": "^0.6.0",
"@hcengineering/tags": "^0.6.16",
"@hcengineering/tags-assets": "^0.6.0",
"@hcengineering/tags-resources": "^0.6.0",
"@hcengineering/task": "^0.6.20",
"@hcengineering/task-assets": "^0.6.19",
"@hcengineering/task-resources": "^0.6.0",
"@hcengineering/telegram": "^0.6.21",
"@hcengineering/telegram-assets": "^0.6.0",
"@hcengineering/telegram-resources": "^0.6.0",
"@hcengineering/templates": "^0.6.11",
"@hcengineering/templates-assets": "^0.6.11",
"@hcengineering/templates-resources": "^0.6.0",
"@hcengineering/test-management": "^0.6.0",
"@hcengineering/test-management-assets": "^0.6.0",
"@hcengineering/test-management-resources": "^0.6.0",
"@hcengineering/text-editor": "^0.6.0",
"@hcengineering/text-editor-assets": "^0.6.0",
"@hcengineering/text-editor-resources": "^0.6.0",
"@hcengineering/theme": "^0.6.5",
"@hcengineering/time": "^0.6.0",
"@hcengineering/time-assets": "^0.6.0",
"@hcengineering/time-resources": "^0.6.0",
"@hcengineering/tracker": "^0.6.24",
"@hcengineering/tracker-assets": "^0.6.0",
"@hcengineering/tracker-resources": "^0.6.0",
"@hcengineering/training": "^0.1.0",
"@hcengineering/training-assets": "^0.1.0",
"@hcengineering/training-resources": "^0.1.0",
"@hcengineering/ui": "^0.6.15",
"@hcengineering/ui-next": "^0.6.0",
"@hcengineering/uploader": "^0.6.0",
"@hcengineering/uploader-assets": "^0.6.0",
"@hcengineering/uploader-resources": "^0.6.0",
"@hcengineering/recorder": "^0.6.0",
"@hcengineering/recorder-assets": "^0.6.0",
"@hcengineering/recorder-resources": "^0.6.0",
"@hcengineering/view": "^0.6.13",
"@hcengineering/view-assets": "^0.6.11",
"@hcengineering/view-resources": "^0.6.0",
Expand Down
Loading