diff --git a/dev/generator/package.json b/dev/generator/package.json index 0ec5824728..2a72e84f4b 100644 --- a/dev/generator/package.json +++ b/dev/generator/package.json @@ -38,23 +38,23 @@ "@hcengineering/account": "^0.6.0", "@hcengineering/core": "^0.6.27", "@hcengineering/contact": "^0.6.19", - "@hcengineering/tracker": "^0.6.11", + "@hcengineering/tracker": "^0.6.12", "@hcengineering/model-all": "^0.6.0", "@hcengineering/model-telegram": "^0.6.0", - "@hcengineering/telegram": "^0.6.12", + "@hcengineering/telegram": "^0.6.13", "@hcengineering/client-resources": "^0.6.21", "ws": "^8.10.0", "@hcengineering/client": "^0.6.13", "@hcengineering/platform": "^0.6.9", "@hcengineering/model": "^0.6.6", - "@hcengineering/recruit": "^0.6.19", + "@hcengineering/recruit": "^0.6.20", "faker": "~5.5.3", "@hcengineering/model-recruit": "^0.6.0", - "@hcengineering/chunter": "^0.6.10", + "@hcengineering/chunter": "^0.6.11", "pdfkit": "~0.13.0", "@hcengineering/attachment": "^0.6.8", "@types/pdfkit": "~0.12.3", - "@hcengineering/task": "^0.6.11", + "@hcengineering/task": "^0.6.12", "jpeg-js": "~0.4.3", "@hcengineering/server-token": "^0.6.6", "@hcengineering/minio": "^0.6.0" diff --git a/dev/prod/package.json b/dev/prod/package.json index 29a2b43380..9ddf95b005 100644 --- a/dev/prod/package.json +++ b/dev/prod/package.json @@ -61,17 +61,17 @@ "@hcengineering/view-resources": "^0.6.0", "@hcengineering/contact": "^0.6.19", "@hcengineering/contact-resources": "^0.6.0", - "@hcengineering/task": "^0.6.11", - "@hcengineering/task-assets": "^0.6.10", + "@hcengineering/task": "^0.6.12", + "@hcengineering/task-assets": "^0.6.11", "@hcengineering/task-resources": "^0.6.0", - "@hcengineering/chunter": "^0.6.10", - "@hcengineering/chunter-assets": "^0.6.8", + "@hcengineering/chunter": "^0.6.11", + "@hcengineering/chunter-assets": "^0.6.9", "@hcengineering/chunter-resources": "^0.6.0", - "@hcengineering/recruit": "^0.6.19", - "@hcengineering/recruit-assets": "^0.6.13", + "@hcengineering/recruit": "^0.6.20", + "@hcengineering/recruit-assets": "^0.6.14", "@hcengineering/recruit-resources": "^0.6.0", - "@hcengineering/setting": "^0.6.9", - "@hcengineering/setting-assets": "^0.6.7", + "@hcengineering/setting": "^0.6.10", + "@hcengineering/setting-assets": "^0.6.8", "@hcengineering/setting-resources": "^0.6.0", "@hcengineering/client-resources": "^0.6.21", "@hcengineering/contact-assets": "^0.6.8", @@ -81,7 +81,7 @@ "@hcengineering/automation": "^0.6.0", "@hcengineering/automation-assets": "^0.6.0", "@hcengineering/automation-resources": "^0.6.0", - "@hcengineering/telegram": "^0.6.12", + "@hcengineering/telegram": "^0.6.13", "@hcengineering/telegram-assets": "^0.6.0", "@hcengineering/telegram-resources": "^0.6.0", "@hcengineering/devmodel": "^0.6.0", @@ -93,7 +93,7 @@ "@hcengineering/lead": "^0.6.0", "@hcengineering/lead-assets": "^0.6.0", "@hcengineering/lead-resources": "^0.6.0", - "@hcengineering/gmail": "^0.6.13", + "@hcengineering/gmail": "^0.6.14", "@hcengineering/gmail-assets": "^0.6.0", "@hcengineering/gmail-resources": "^0.6.0", "@hcengineering/image-cropper": "^0.6.0", @@ -112,8 +112,8 @@ "@hcengineering/templates": "^0.6.6", "@hcengineering/templates-assets": "^0.6.6", "@hcengineering/templates-resources": "^0.6.0", - "@hcengineering/notification": "^0.6.14", - "@hcengineering/notification-assets": "^0.6.8", + "@hcengineering/notification": "^0.6.15", + "@hcengineering/notification-assets": "^0.6.9", "@hcengineering/notification-resources": "^0.6.0", "@hcengineering/preference": "^0.6.8", "@hcengineering/preference-assets": "^0.6.0", @@ -134,8 +134,8 @@ "@hcengineering/server-tags-resources": "^0.6.0", "@hcengineering/server-task": "^0.6.0", "@hcengineering/server-task-resources": "^0.6.0", - "@hcengineering/calendar": "^0.6.15", - "@hcengineering/calendar-assets": "^0.6.13", + "@hcengineering/calendar": "^0.6.16", + "@hcengineering/calendar-assets": "^0.6.14", "@hcengineering/calendar-resources": "^0.6.0", "@hcengineering/server-calendar": "^0.6.0", "@hcengineering/server-calendar-resources": "^0.6.0", @@ -146,25 +146,25 @@ "@hcengineering/presentation": "^0.6.2", "@hcengineering/server-tracker": "^0.6.0", "@hcengineering/server-tracker-resources": "^0.6.0", - "@hcengineering/tracker": "^0.6.11", + "@hcengineering/tracker": "^0.6.12", "@hcengineering/tracker-assets": "^0.6.0", "@hcengineering/tracker-resources": "^0.6.0", "@hcengineering/text-editor": "^0.6.0", - "@hcengineering/board": "^0.6.10", - "@hcengineering/board-assets": "^0.6.10", + "@hcengineering/board": "^0.6.11", + "@hcengineering/board-assets": "^0.6.11", "@hcengineering/board-resources": "^0.6.0", - "@hcengineering/hr": "^0.6.10", - "@hcengineering/hr-assets": "^0.6.10", + "@hcengineering/hr": "^0.6.11", + "@hcengineering/hr-assets": "^0.6.11", "@hcengineering/hr-resources": "^0.6.0", "@hcengineering/server-hr": "^0.6.0", "@hcengineering/server-hr-resources": "^0.6.0", - "@hcengineering/bitrix": "^0.6.42", + "@hcengineering/bitrix": "^0.6.43", "@hcengineering/bitrix-assets": "^0.6.0", "@hcengineering/bitrix-resources": "^0.6.0", "@hcengineering/support": "^0.6.0", "@hcengineering/support-assets": "^0.6.0", "@hcengineering/support-resources": "^0.6.0", - "@hcengineering/request": "^0.6.4", + "@hcengineering/request": "^0.6.5", "@hcengineering/request-assets": "^0.6.0", "@hcengineering/request-resources": "^0.6.0", "@hcengineering/server-request": "^0.6.0", diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts index 370e980a1b..5a7a810a3d 100644 --- a/dev/prod/src/platform.ts +++ b/dev/prod/src/platform.ts @@ -122,7 +122,8 @@ export async function configurePlatform() { uiPlugin.metadata.Routes, new Map([ [workbenchId, workbench.component.WorkbenchApp], - [loginId, login.component.LoginApp] + [loginId, login.component.LoginApp], + [calendarId, calendar.component.ConnectApp] ]) ) diff --git a/dev/tool/package.json b/dev/tool/package.json index 4c6f3d2531..07bc72a1fa 100644 --- a/dev/tool/package.json +++ b/dev/tool/package.json @@ -50,7 +50,7 @@ "@hcengineering/contact": "^0.6.19", "@hcengineering/model-all": "^0.6.0", "@hcengineering/model-telegram": "^0.6.0", - "@hcengineering/telegram": "^0.6.12", + "@hcengineering/telegram": "^0.6.13", "@hcengineering/client-resources": "^0.6.21", "ws": "^8.10.0", "@hcengineering/client": "^0.6.13", @@ -69,9 +69,9 @@ "@hcengineering/server-attachment-resources": "^0.6.0", "xml2js": "~0.4.23", "@hcengineering/model-recruit": "^0.6.0", - "@hcengineering/recruit": "^0.6.19", - "@hcengineering/task": "^0.6.11", - "@hcengineering/chunter": "^0.6.10", + "@hcengineering/recruit": "^0.6.20", + "@hcengineering/task": "^0.6.12", + "@hcengineering/chunter": "^0.6.11", "mime-types": "~2.1.34", "@hcengineering/attachment": "^0.6.8", "@hcengineering/server-contact": "^0.6.1", @@ -115,9 +115,9 @@ "@hcengineering/lead": "^0.6.0", "email-addresses": "^5.0.0", "libphonenumber-js": "^1.9.46", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/minio": "^0.6.0", "@hcengineering/openai": "^0.6.0", - "@hcengineering/tracker": "^0.6.11" + "@hcengineering/tracker": "^0.6.12" } } diff --git a/models/automation/package.json b/models/automation/package.json index d6932f5099..8a2a8ff24a 100644 --- a/models/automation/package.json +++ b/models/automation/package.json @@ -30,7 +30,7 @@ "@hcengineering/model": "^0.6.6", "@hcengineering/model-core": "^0.6.0", "@hcengineering/view": "^0.6.8", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/platform": "^0.6.9", "@hcengineering/automation-resources": "^0.6.0" } diff --git a/models/bitrix/package.json b/models/bitrix/package.json index 13d3b25b7d..7ba555ad7c 100644 --- a/models/bitrix/package.json +++ b/models/bitrix/package.json @@ -35,11 +35,11 @@ "@hcengineering/view": "^0.6.8", "@hcengineering/model-view": "^0.6.0", "@hcengineering/contact": "^0.6.19", - "@hcengineering/bitrix": "^0.6.42", + "@hcengineering/bitrix": "^0.6.43", "@hcengineering/bitrix-resources": "^0.6.0", "@hcengineering/preference": "^0.6.8", "@hcengineering/model-preference": "^0.6.0", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/ui": "^0.6.10" } } diff --git a/models/board/package.json b/models/board/package.json index 5af0fbf761..e4d03f1b09 100644 --- a/models/board/package.json +++ b/models/board/package.json @@ -37,10 +37,10 @@ "@hcengineering/model-chunter": "^0.6.0", "@hcengineering/model-attachment": "^0.6.0", "@hcengineering/automation": "^0.6.0", - "@hcengineering/board": "^0.6.10", + "@hcengineering/board": "^0.6.11", "@hcengineering/board-resources": "^0.6.0", "@hcengineering/view": "^0.6.8", - "@hcengineering/task": "^0.6.11", + "@hcengineering/task": "^0.6.12", "@hcengineering/model-task": "^0.6.0", "@hcengineering/workbench": "^0.6.8", "@hcengineering/model-preference": "^0.6.0", diff --git a/models/calendar/package.json b/models/calendar/package.json index 8b11c04e54..240f9d80b3 100644 --- a/models/calendar/package.json +++ b/models/calendar/package.json @@ -30,12 +30,12 @@ "@hcengineering/ui": "^0.6.10", "@hcengineering/view": "^0.6.8", "@hcengineering/model-attachment": "^0.6.0", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/model-task": "^0.6.0", - "@hcengineering/calendar": "^0.6.15", + "@hcengineering/calendar": "^0.6.16", "@hcengineering/calendar-resources": "^0.6.0", "@hcengineering/platform": "^0.6.9", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/model-core": "^0.6.0", "@hcengineering/model-view": "^0.6.0", "@hcengineering/model-setting": "^0.6.0", diff --git a/models/chunter/package.json b/models/chunter/package.json index 42ba3af1de..f2e5ff2fb3 100644 --- a/models/chunter/package.json +++ b/models/chunter/package.json @@ -31,14 +31,14 @@ "@hcengineering/view": "^0.6.8", "@hcengineering/model-attachment": "^0.6.0", "@hcengineering/contact": "^0.6.19", - "@hcengineering/chunter": "^0.6.10", + "@hcengineering/chunter": "^0.6.11", "@hcengineering/chunter-resources": "^0.6.0", "@hcengineering/platform": "^0.6.9", "@hcengineering/model-core": "^0.6.0", "@hcengineering/model-view": "^0.6.0", "@hcengineering/model-workbench": "^0.6.1", "@hcengineering/model-notification": "^0.6.0", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/activity": "^0.6.0", "@hcengineering/workbench": "^0.6.8", "@hcengineering/model-preference": "^0.6.0" diff --git a/models/contact/package.json b/models/contact/package.json index 6ecfd5fc4d..4f9da0f954 100644 --- a/models/contact/package.json +++ b/models/contact/package.json @@ -33,13 +33,13 @@ "@hcengineering/model-view": "^0.6.0", "@hcengineering/model-presentation": "^0.6.0", "@hcengineering/model": "^0.6.6", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/core": "^0.6.27", "@hcengineering/ui": "^0.6.10", "@hcengineering/platform": "^0.6.9", "@hcengineering/activity": "^0.6.0", "@hcengineering/contact": "^0.6.19", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/contact-resources": "^0.6.0", "@hcengineering/view": "^0.6.8", "cross-fetch": "^3.1.5", diff --git a/models/gmail/package.json b/models/gmail/package.json index 62c48620c2..1b6b8937bb 100644 --- a/models/gmail/package.json +++ b/models/gmail/package.json @@ -32,14 +32,14 @@ "@hcengineering/model-core": "^0.6.0", "@hcengineering/contact": "^0.6.19", "@hcengineering/model-contact": "^0.6.1", - "@hcengineering/gmail": "^0.6.13", + "@hcengineering/gmail": "^0.6.14", "@hcengineering/gmail-resources": "^0.6.0", "@hcengineering/model-attachment": "^0.6.0", "@hcengineering/model-view": "^0.6.0", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/model-notification": "^0.6.0", "@hcengineering/view": "^0.6.8", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/ui": "^0.6.10" } } diff --git a/models/hr/package.json b/models/hr/package.json index e2c4c61762..d2daac44cd 100644 --- a/models/hr/package.json +++ b/models/hr/package.json @@ -31,14 +31,14 @@ "@hcengineering/contact": "^0.6.19", "@hcengineering/platform": "^0.6.9", "@hcengineering/model-core": "^0.6.0", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/model-view": "^0.6.0", "@hcengineering/model-workbench": "^0.6.1", "@hcengineering/model-contact": "^0.6.1", "@hcengineering/model-chunter": "^0.6.0", "@hcengineering/model-calendar": "^0.6.0", "@hcengineering/model-attachment": "^0.6.0", - "@hcengineering/hr": "^0.6.10", + "@hcengineering/hr": "^0.6.11", "@hcengineering/hr-resources": "^0.6.0", "@hcengineering/view": "^0.6.8" } diff --git a/models/inventory/package.json b/models/inventory/package.json index 068a87f438..ba68c49d2b 100644 --- a/models/inventory/package.json +++ b/models/inventory/package.json @@ -32,11 +32,11 @@ "@hcengineering/model-core": "^0.6.0", "@hcengineering/ui": "^0.6.10", "@hcengineering/platform": "^0.6.9", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/inventory": "^0.6.6", "@hcengineering/inventory-resources": "^0.6.0", "@hcengineering/view": "^0.6.8", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/workbench": "^0.6.8", "@hcengineering/model-view": "^0.6.0" } diff --git a/models/lead/package.json b/models/lead/package.json index b35fe255b9..0bc90495ce 100644 --- a/models/lead/package.json +++ b/models/lead/package.json @@ -38,11 +38,11 @@ "@hcengineering/model-attachment": "^0.6.0", "@hcengineering/lead": "^0.6.0", "@hcengineering/lead-resources": "^0.6.0", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/view": "^0.6.8", - "@hcengineering/task": "^0.6.11", + "@hcengineering/task": "^0.6.12", "@hcengineering/model-notification": "^0.6.0", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/model-task": "^0.6.0", "@hcengineering/workbench": "^0.6.8", "@hcengineering/model-tracker": "^0.6.0" diff --git a/models/notification/package.json b/models/notification/package.json index 1001f4a532..1977d756ab 100644 --- a/models/notification/package.json +++ b/models/notification/package.json @@ -36,8 +36,8 @@ "@hcengineering/view": "^0.6.8", "@hcengineering/workbench": "^0.6.8", "@hcengineering/model-workbench": "^0.6.1", - "@hcengineering/notification": "^0.6.14", - "@hcengineering/setting": "^0.6.9", - "@hcengineering/chunter": "^0.6.10" + "@hcengineering/notification": "^0.6.15", + "@hcengineering/setting": "^0.6.10", + "@hcengineering/chunter": "^0.6.11" } } diff --git a/models/recruit/package.json b/models/recruit/package.json index 1917840a30..9784b7427e 100644 --- a/models/recruit/package.json +++ b/models/recruit/package.json @@ -34,15 +34,15 @@ "@hcengineering/model-view": "^0.6.0", "@hcengineering/model-workbench": "^0.6.1", "@hcengineering/model-contact": "^0.6.1", - "@hcengineering/recruit": "^0.6.19", + "@hcengineering/recruit": "^0.6.20", "@hcengineering/recruit-resources": "^0.6.0", - "@hcengineering/chunter": "^0.6.10", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/chunter": "^0.6.11", + "@hcengineering/notification": "^0.6.15", "@hcengineering/model-attachment": "^0.6.0", "@hcengineering/model-chunter": "^0.6.0", "@hcengineering/view": "^0.6.8", - "@hcengineering/task": "^0.6.11", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/task": "^0.6.12", + "@hcengineering/setting": "^0.6.10", "@hcengineering/model-task": "^0.6.0", "@hcengineering/workbench": "^0.6.8", "@hcengineering/model-tracker": "^0.6.0", diff --git a/models/request/package.json b/models/request/package.json index 3965ce2933..4158f7ebc9 100644 --- a/models/request/package.json +++ b/models/request/package.json @@ -33,11 +33,11 @@ "@hcengineering/model-core": "^0.6.0", "@hcengineering/model-view": "^0.6.0", "@hcengineering/model-chunter": "^0.6.0", - "@hcengineering/request": "^0.6.4", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/request": "^0.6.5", + "@hcengineering/notification": "^0.6.15", "@hcengineering/model-notification": "^0.6.0", "@hcengineering/activity": "^0.6.0", - "@hcengineering/chunter": "^0.6.10", + "@hcengineering/chunter": "^0.6.11", "@hcengineering/request-resources": "^0.6.0" } } diff --git a/models/server-calendar/package.json b/models/server-calendar/package.json index ba9ce94566..18684d329b 100644 --- a/models/server-calendar/package.json +++ b/models/server-calendar/package.json @@ -28,7 +28,7 @@ "@hcengineering/core": "^0.6.27", "@hcengineering/model": "^0.6.6", "@hcengineering/platform": "^0.6.9", - "@hcengineering/calendar": "^0.6.15", + "@hcengineering/calendar": "^0.6.16", "@hcengineering/server-notification": "^0.6.1", "@hcengineering/server-calendar": "^0.6.0", "@hcengineering/contact": "^0.6.19", diff --git a/models/server-chunter/package.json b/models/server-chunter/package.json index 3be7036e47..8ec401c597 100644 --- a/models/server-chunter/package.json +++ b/models/server-chunter/package.json @@ -30,8 +30,8 @@ "@hcengineering/platform": "^0.6.9", "@hcengineering/server-chunter": "^0.6.0", "@hcengineering/server-core": "^0.6.1", - "@hcengineering/chunter": "^0.6.10", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/chunter": "^0.6.11", + "@hcengineering/notification": "^0.6.15", "@hcengineering/server-notification": "^0.6.1" } } diff --git a/models/server-gmail/package.json b/models/server-gmail/package.json index 1fecd414c0..69d2931825 100644 --- a/models/server-gmail/package.json +++ b/models/server-gmail/package.json @@ -26,13 +26,13 @@ }, "dependencies": { "@hcengineering/core": "^0.6.27", - "@hcengineering/gmail": "^0.6.13", + "@hcengineering/gmail": "^0.6.14", "@hcengineering/model": "^0.6.6", "@hcengineering/contact": "^0.6.19", "@hcengineering/platform": "^0.6.9", "@hcengineering/server-gmail": "^0.6.0", "@hcengineering/server-core": "^0.6.1", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/server-notification": "^0.6.1" } } diff --git a/models/server-hr/package.json b/models/server-hr/package.json index c58ddc064e..f55542a907 100644 --- a/models/server-hr/package.json +++ b/models/server-hr/package.json @@ -28,7 +28,7 @@ "@hcengineering/core": "^0.6.27", "@hcengineering/model": "^0.6.6", "@hcengineering/platform": "^0.6.9", - "@hcengineering/hr": "^0.6.10", + "@hcengineering/hr": "^0.6.11", "@hcengineering/server-notification": "^0.6.1", "@hcengineering/server-hr": "^0.6.0", "@hcengineering/server-core": "^0.6.1" diff --git a/models/server-lead/package.json b/models/server-lead/package.json index 6dbcdc3858..66fc73140e 100644 --- a/models/server-lead/package.json +++ b/models/server-lead/package.json @@ -32,7 +32,7 @@ "@hcengineering/server-core": "^0.6.1", "@hcengineering/lead": "^0.6.0", "@hcengineering/model-lead": "^0.6.0", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/server-notification": "^0.6.1" } } diff --git a/models/server-notification/package.json b/models/server-notification/package.json index aaaefd5e1c..5270d9603b 100644 --- a/models/server-notification/package.json +++ b/models/server-notification/package.json @@ -29,7 +29,7 @@ "@hcengineering/model": "^0.6.6", "@hcengineering/model-core": "^0.6.0", "@hcengineering/platform": "^0.6.9", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/model-notification": "^0.6.0", "@hcengineering/server-notification": "^0.6.1", "@hcengineering/server-core": "^0.6.1" diff --git a/models/server-recruit/package.json b/models/server-recruit/package.json index c2b7c806f2..268791a9c8 100644 --- a/models/server-recruit/package.json +++ b/models/server-recruit/package.json @@ -31,7 +31,7 @@ "@hcengineering/server-recruit": "^0.6.0", "@hcengineering/server-core": "^0.6.1", "@hcengineering/model-recruit": "^0.6.0", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/server-notification": "^0.6.1" } } diff --git a/models/server-setting/package.json b/models/server-setting/package.json index 732d1d6c90..3d0d2812a9 100644 --- a/models/server-setting/package.json +++ b/models/server-setting/package.json @@ -28,7 +28,7 @@ "@hcengineering/core": "^0.6.27", "@hcengineering/model": "^0.6.6", "@hcengineering/platform": "^0.6.9", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/server-notification": "^0.6.1", "@hcengineering/server-setting": "^0.6.0", "@hcengineering/server-core": "^0.6.1" diff --git a/models/server-task/package.json b/models/server-task/package.json index 14e1fa3eda..72b2affe98 100644 --- a/models/server-task/package.json +++ b/models/server-task/package.json @@ -30,7 +30,7 @@ "@hcengineering/platform": "^0.6.9", "@hcengineering/server-task": "^0.6.0", "@hcengineering/server-core": "^0.6.1", - "@hcengineering/task": "^0.6.11", + "@hcengineering/task": "^0.6.12", "@hcengineering/server-notification": "^0.6.1" } } diff --git a/models/server-telegram/package.json b/models/server-telegram/package.json index e04a58f77a..6a6da17d24 100644 --- a/models/server-telegram/package.json +++ b/models/server-telegram/package.json @@ -31,8 +31,8 @@ "@hcengineering/platform": "^0.6.9", "@hcengineering/server-telegram": "^0.6.0", "@hcengineering/server-core": "^0.6.1", - "@hcengineering/telegram": "^0.6.12", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/telegram": "^0.6.13", + "@hcengineering/notification": "^0.6.15", "@hcengineering/server-notification": "^0.6.1" } } diff --git a/models/server-tracker/package.json b/models/server-tracker/package.json index 459ac17070..828e8f3fc4 100644 --- a/models/server-tracker/package.json +++ b/models/server-tracker/package.json @@ -27,9 +27,9 @@ "dependencies": { "@hcengineering/core": "^0.6.27", "@hcengineering/model": "^0.6.6", - "@hcengineering/tracker": "^0.6.11", + "@hcengineering/tracker": "^0.6.12", "@hcengineering/server-core": "^0.6.1", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/server-notification": "^0.6.1", "@hcengineering/model-tracker": "^0.6.0", "@hcengineering/server-tracker": "^0.6.0" diff --git a/models/setting/package.json b/models/setting/package.json index a5c2051a8d..011e41c3c8 100644 --- a/models/setting/package.json +++ b/models/setting/package.json @@ -29,15 +29,15 @@ "@hcengineering/model": "^0.6.6", "@hcengineering/ui": "^0.6.10", "@hcengineering/view": "^0.6.8", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/contact": "^0.6.19", "@hcengineering/setting-resources": "^0.6.0", "@hcengineering/platform": "^0.6.9", "@hcengineering/model-core": "^0.6.0", "@hcengineering/model-view": "^0.6.0", "@hcengineering/model-workbench": "^0.6.1", - "@hcengineering/task": "^0.6.11", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/task": "^0.6.12", + "@hcengineering/notification": "^0.6.15", "@hcengineering/templates": "^0.6.6", "@hcengineering/activity": "^0.6.0" } diff --git a/models/setting/src/index.ts b/models/setting/src/index.ts index 86ae6dc1e1..1c67ceffe6 100644 --- a/models/setting/src/index.ts +++ b/models/setting/src/index.ts @@ -50,6 +50,7 @@ export class TIntegration extends TDoc implements Integration { disabled!: boolean value!: string shared!: Ref[] + error?: IntlString | null } @Model(setting.class.SettingsCategory, core.class.Doc, DOMAIN_MODEL) export class TSettingsCategory extends TDoc implements SettingsCategory { diff --git a/models/task/package.json b/models/task/package.json index 1682e8f004..7160a0e279 100644 --- a/models/task/package.json +++ b/models/task/package.json @@ -35,8 +35,8 @@ "@hcengineering/model-workbench": "^0.6.1", "@hcengineering/model-contact": "^0.6.1", "@hcengineering/model-attachment": "^0.6.0", - "@hcengineering/notification": "^0.6.14", - "@hcengineering/task": "^0.6.11", + "@hcengineering/notification": "^0.6.15", + "@hcengineering/task": "^0.6.12", "@hcengineering/task-resources": "^0.6.0", "@hcengineering/model-chunter": "^0.6.0", "@hcengineering/workbench": "^0.6.8", diff --git a/models/telegram/package.json b/models/telegram/package.json index 704e4381ca..be0f890565 100644 --- a/models/telegram/package.json +++ b/models/telegram/package.json @@ -32,14 +32,14 @@ "@hcengineering/model-core": "^0.6.0", "@hcengineering/model-attachment": "^0.6.0", "@hcengineering/model-notification": "^0.6.0", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/model-contact": "^0.6.1", "@hcengineering/view": "^0.6.8", "@hcengineering/contact": "^0.6.19", - "@hcengineering/telegram": "^0.6.12", + "@hcengineering/telegram": "^0.6.13", "@hcengineering/telegram-resources": "^0.6.0", "@hcengineering/templates": "^0.6.6", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/ui": "^0.6.10" } } diff --git a/models/templates/package.json b/models/templates/package.json index 4b5b2f4e59..58a2cb19b5 100644 --- a/models/templates/package.json +++ b/models/templates/package.json @@ -36,7 +36,7 @@ "@hcengineering/model-tracker": "^0.6.0", "@hcengineering/templates": "^0.6.6", "@hcengineering/templates-resources": "^0.6.0", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/ui": "^0.6.10", "@hcengineering/model-text-editor": "^0.6.0" } diff --git a/models/tracker/package.json b/models/tracker/package.json index aedd6baa55..4f8eb3949a 100644 --- a/models/tracker/package.json +++ b/models/tracker/package.json @@ -36,17 +36,17 @@ "@hcengineering/model-workbench": "^0.6.1", "@hcengineering/model-contact": "^0.6.1", "@hcengineering/model-attachment": "^0.6.0", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/model-notification": "^0.6.0", - "@hcengineering/tracker": "^0.6.11", + "@hcengineering/tracker": "^0.6.12", "@hcengineering/tracker-resources": "^0.6.0", "@hcengineering/model-task": "^0.6.0", "@hcengineering/model-chunter": "^0.6.0", "@hcengineering/workbench": "^0.6.8", "@hcengineering/view": "^0.6.8", "@hcengineering/model-presentation": "^0.6.0", - "@hcengineering/setting": "^0.6.9", - "@hcengineering/task": "^0.6.11", + "@hcengineering/setting": "^0.6.10", + "@hcengineering/task": "^0.6.12", "@hcengineering/tags": "^0.6.11" } } diff --git a/packages/kanban/package.json b/packages/kanban/package.json index 15992becbb..66e0699fbf 100644 --- a/packages/kanban/package.json +++ b/packages/kanban/package.json @@ -38,6 +38,6 @@ "@hcengineering/platform": "^0.6.9", "@hcengineering/core": "^0.6.27", "@hcengineering/presentation": "^0.6.2", - "@hcengineering/notification": "^0.6.14" + "@hcengineering/notification": "^0.6.15" } } diff --git a/packages/panel/package.json b/packages/panel/package.json index a05a3f977f..b0ebe00844 100644 --- a/packages/panel/package.json +++ b/packages/panel/package.json @@ -1,6 +1,6 @@ { "name": "@hcengineering/panel", - "version": "0.6.13", + "version": "0.6.14", "main": "src/index.ts", "author": "Anticrm Platform Contributors", "license": "EPL-2.0", @@ -37,10 +37,10 @@ "svelte": "3.55.1", "@hcengineering/platform": "^0.6.9", "@hcengineering/core": "^0.6.27", - "@hcengineering/chunter": "^0.6.10", + "@hcengineering/chunter": "^0.6.11", "@hcengineering/presentation": "^0.6.2", "@hcengineering/activity": "^0.6.0", - "@hcengineering/calendar": "^0.6.15" + "@hcengineering/calendar": "^0.6.16" }, "repository": "https://github.com/hcenginneing/anticrm", "publishConfig": { diff --git a/plugins/activity-resources/package.json b/plugins/activity-resources/package.json index 7becaa0d10..0f9663bd10 100644 --- a/plugins/activity-resources/package.json +++ b/plugins/activity-resources/package.json @@ -37,10 +37,10 @@ "@hcengineering/presentation": "^0.6.2", "@hcengineering/activity": "^0.6.0", "svelte": "3.55.1", - "@hcengineering/chunter": "^0.6.10", + "@hcengineering/chunter": "^0.6.11", "@hcengineering/text-editor": "^0.6.0", "@hcengineering/contact": "^0.6.19", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/view": "^0.6.8", "@hcengineering/view-resources": "^0.6.0", "@hcengineering/attachment": "^0.6.8" diff --git a/plugins/attachment-resources/package.json b/plugins/attachment-resources/package.json index 196d1b8041..447c9ae523 100644 --- a/plugins/attachment-resources/package.json +++ b/plugins/attachment-resources/package.json @@ -41,7 +41,7 @@ "@hcengineering/core": "^0.6.27", "@hcengineering/view": "^0.6.8", "@hcengineering/view-resources": "^0.6.0", - "@hcengineering/panel": "^0.6.13", + "@hcengineering/panel": "^0.6.14", "@hcengineering/text-editor": "^0.6.0", "@hcengineering/login": "^0.6.7", "filesize": "^8.0.3", diff --git a/plugins/bitrix-assets/package.json b/plugins/bitrix-assets/package.json index e905e8fcac..693d0832bb 100644 --- a/plugins/bitrix-assets/package.json +++ b/plugins/bitrix-assets/package.json @@ -30,6 +30,6 @@ }, "dependencies": { "@hcengineering/platform": "^0.6.9", - "@hcengineering/bitrix": "^0.6.42" + "@hcengineering/bitrix": "^0.6.43" } } diff --git a/plugins/bitrix-resources/package.json b/plugins/bitrix-resources/package.json index 4715a92772..f2aa66e12f 100644 --- a/plugins/bitrix-resources/package.json +++ b/plugins/bitrix-resources/package.json @@ -34,28 +34,28 @@ "dependencies": { "@hcengineering/platform": "^0.6.9", "svelte": "3.55.1", - "@hcengineering/bitrix": "^0.6.42", + "@hcengineering/bitrix": "^0.6.43", "@hcengineering/ui": "^0.6.10", "@hcengineering/presentation": "^0.6.2", "@hcengineering/text-editor": "^0.6.0", "@hcengineering/contact": "^0.6.19", "@hcengineering/lead": "^0.6.0", "@hcengineering/login": "^0.6.7", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/setting": "^0.6.10", "@hcengineering/core": "^0.6.27", "@hcengineering/attachment": "^0.6.8", "@hcengineering/attachment-resources": "^0.6.0", "@hcengineering/view": "^0.6.8", "@hcengineering/view-resources": "^0.6.0", "@hcengineering/setting-resources": "^0.6.0", - "@hcengineering/chunter": "^0.6.10", + "@hcengineering/chunter": "^0.6.11", "p-queue": "~7.3.0", "qs": "~6.11.0", "@hcengineering/tags": "^0.6.11", "@hcengineering/tags-resources": "^0.6.0", "fast-equals": "^2.0.3", - "@hcengineering/recruit": "^0.6.19", - "@hcengineering/task": "^0.6.11" + "@hcengineering/recruit": "^0.6.20", + "@hcengineering/task": "^0.6.12" }, "repository": "https://github.com/hcengineering/anticrm", "publishConfig": { diff --git a/plugins/bitrix/package.json b/plugins/bitrix/package.json index 1a7ea9b12a..14bcd98778 100644 --- a/plugins/bitrix/package.json +++ b/plugins/bitrix/package.json @@ -1,6 +1,6 @@ { "name": "@hcengineering/bitrix", - "version": "0.6.42", + "version": "0.6.43", "main": "lib/index.js", "author": "Anticrm Platform Contributors", "license": "EPL-2.0", @@ -32,13 +32,13 @@ "@hcengineering/preference": "^0.6.8", "@hcengineering/tags": "^0.6.11", "@hcengineering/contact": "^0.6.19", - "@hcengineering/chunter": "^0.6.10", + "@hcengineering/chunter": "^0.6.11", "@hcengineering/attachment": "^0.6.8", "fast-equals": "^2.0.3", "qs": "~6.11.0", - "@hcengineering/gmail": "^0.6.13", - "@hcengineering/recruit": "^0.6.19", - "@hcengineering/task": "^0.6.11" + "@hcengineering/gmail": "^0.6.14", + "@hcengineering/recruit": "^0.6.20", + "@hcengineering/task": "^0.6.12" }, "repository": "https://github.com/hcengineering/anticrm", "publishConfig": { diff --git a/plugins/board-assets/package.json b/plugins/board-assets/package.json index 4c493e79ce..06ac12e406 100644 --- a/plugins/board-assets/package.json +++ b/plugins/board-assets/package.json @@ -1,6 +1,6 @@ { "name": "@hcengineering/board-assets", - "version": "0.6.10", + "version": "0.6.11", "main": "lib/index.js", "author": "Anticrm Platform Contributors", "template": "@hcengineering/assets-package", @@ -30,7 +30,7 @@ }, "dependencies": { "@hcengineering/platform": "^0.6.9", - "@hcengineering/board": "^0.6.10" + "@hcengineering/board": "^0.6.11" }, "repository": "https://github.com/hcenginneing/anticrm", "publishConfig": { diff --git a/plugins/board-resources/package.json b/plugins/board-resources/package.json index 60effc28a4..7e8c8d82d5 100644 --- a/plugins/board-resources/package.json +++ b/plugins/board-resources/package.json @@ -34,20 +34,20 @@ "@hcengineering/activity": "^0.6.0", "@hcengineering/attachment": "^0.6.8", "@hcengineering/attachment-resources": "^0.6.0", - "@hcengineering/board": "^0.6.10", - "@hcengineering/calendar": "^0.6.15", - "@hcengineering/chunter": "^0.6.10", + "@hcengineering/board": "^0.6.11", + "@hcengineering/calendar": "^0.6.16", + "@hcengineering/chunter": "^0.6.11", "@hcengineering/chunter-resources": "^0.6.0", "@hcengineering/contact": "^0.6.19", "@hcengineering/contact-resources": "^0.6.0", "@hcengineering/task-resources": "^0.6.0", "@hcengineering/core": "^0.6.27", - "@hcengineering/notification": "^0.6.14", + "@hcengineering/notification": "^0.6.15", "@hcengineering/notification-resources": "^0.6.0", - "@hcengineering/panel": "^0.6.13", + "@hcengineering/panel": "^0.6.14", "@hcengineering/platform": "^0.6.9", "@hcengineering/presentation": "^0.6.2", - "@hcengineering/task": "^0.6.11", + "@hcengineering/task": "^0.6.12", "@hcengineering/text-editor": "^0.6.0", "@hcengineering/ui": "^0.6.10", "@hcengineering/view": "^0.6.8", diff --git a/plugins/board/package.json b/plugins/board/package.json index 9315861612..284d83008b 100644 --- a/plugins/board/package.json +++ b/plugins/board/package.json @@ -1,6 +1,6 @@ { "name": "@hcengineering/board", - "version": "0.6.10", + "version": "0.6.11", "main": "lib/index.js", "author": "Anticrm Platform Contributors", "license": "EPL-2.0", @@ -30,7 +30,7 @@ "@hcengineering/core": "^0.6.27", "@hcengineering/platform": "^0.6.9", "@hcengineering/view": "^0.6.8", - "@hcengineering/task": "^0.6.11", + "@hcengineering/task": "^0.6.12", "@hcengineering/ui": "^0.6.10", "@hcengineering/preference": "^0.6.8", "@hcengineering/tags": "^0.6.11" diff --git a/plugins/calendar-assets/assets/permission.png b/plugins/calendar-assets/assets/permission.png new file mode 100644 index 0000000000..7d0af948c2 Binary files /dev/null and b/plugins/calendar-assets/assets/permission.png differ diff --git a/plugins/calendar-assets/lang/en.json b/plugins/calendar-assets/lang/en.json index 4355440326..ea3314ab52 100644 --- a/plugins/calendar-assets/lang/en.json +++ b/plugins/calendar-assets/lang/en.json @@ -45,7 +45,7 @@ "ExternalParticipants": "External participants", "IntegrationDescr": "Use Google Calendar integration", "Connect": "Connect", - "RedirectGoogle": "You will be redirect to google auth page", + "RedirectGoogle": "You will be redirect to google auth page. Please make sure to select all permissions.", "ConnectCalendar": "Connect Google Calendar account", "EditRecEvent": "Edit recurring event", "RemoveRecEvent": "Remove recurring event", @@ -83,6 +83,7 @@ "Private": "Only visible to you", "Public": "Visible to everyone", "FreeBusy": "FreeBusy", - "DefaultVisibility": "Default visibility" + "DefaultVisibility": "Default visibility", + "NotAllPermissions": "Not all permissions were granted" } } \ No newline at end of file diff --git a/plugins/calendar-assets/lang/ru.json b/plugins/calendar-assets/lang/ru.json index 84b1c39058..335ebec325 100644 --- a/plugins/calendar-assets/lang/ru.json +++ b/plugins/calendar-assets/lang/ru.json @@ -45,7 +45,7 @@ "ExternalParticipants": "Внешние участники", "IntegrationDescr": "Подключить Google Календарь", "Connect": "Подключить", - "RedirectGoogle": "Вы будете перенаправлены на страницу авторизации Google", + "RedirectGoogle": "Вы будете перенаправлены на страницу авторизации Google. Пожалуйста убедитесь что выбрали все разрешения", "ConnectCalendar": "Подключить Google Календарь", "EditRecEvent": "Изменение повторяющегося события", "RemoveRecEvent": "Удаление повторяющегося события", @@ -83,6 +83,7 @@ "Private": "Видно только Вам", "Public": "Видно всем", "FreeBusy": "Скрыть детали", - "DefaultVisibility": "Видимость по умолчанию" + "DefaultVisibility": "Видимость по умолчанию", + "NotAllPermissions": "Были предоставлены не все разрешения" } } \ No newline at end of file diff --git a/plugins/calendar-assets/package.json b/plugins/calendar-assets/package.json index 47e42e63d0..48f3854a88 100644 --- a/plugins/calendar-assets/package.json +++ b/plugins/calendar-assets/package.json @@ -1,6 +1,6 @@ { "name": "@hcengineering/calendar-assets", - "version": "0.6.13", + "version": "0.6.14", "main": "lib/index.js", "author": "Anticrm Platform Contributors", "template": "@hcengineering/assets-package", @@ -30,7 +30,7 @@ }, "dependencies": { "@hcengineering/platform": "^0.6.9", - "@hcengineering/calendar": "^0.6.15" + "@hcengineering/calendar": "^0.6.16" }, "repository": "https://github.com/hcenginneing/anticrm", "publishConfig": { diff --git a/plugins/calendar-assets/src/index.ts b/plugins/calendar-assets/src/index.ts index 369014b425..1ab2583189 100644 --- a/plugins/calendar-assets/src/index.ts +++ b/plugins/calendar-assets/src/index.ts @@ -32,4 +32,10 @@ loadMetadata(calendar.icon, { Hidden: `${icons}#eyeCrossed` }) +const permission = require('../assets/permission.png') as string // eslint-disable-line + +loadMetadata(calendar.image, { + Permissions: permission +}) + addStringsLoader(calendarId, async (lang: string) => await import(`../lang/${lang}.json`)) diff --git a/plugins/calendar-resources/package.json b/plugins/calendar-resources/package.json index 10a694c238..a41000315e 100644 --- a/plugins/calendar-resources/package.json +++ b/plugins/calendar-resources/package.json @@ -36,13 +36,13 @@ "@hcengineering/platform": "^0.6.9", "@hcengineering/ui": "^0.6.10", "@hcengineering/presentation": "^0.6.2", - "@hcengineering/calendar": "^0.6.15", - "@hcengineering/setting": "^0.6.9", + "@hcengineering/calendar": "^0.6.16", + "@hcengineering/setting": "^0.6.10", "@hcengineering/theme": "^0.6.3", "svelte": "3.55.1", "@hcengineering/text-editor": "^0.6.0", "@hcengineering/contact": "^0.6.19", - "@hcengineering/panel": "^0.6.13", + "@hcengineering/panel": "^0.6.14", "@hcengineering/contact-resources": "^0.6.0", "@hcengineering/view-resources": "^0.6.0", "@hcengineering/view": "^0.6.8", diff --git a/plugins/calendar-resources/src/components/ConnectApp.svelte b/plugins/calendar-resources/src/components/ConnectApp.svelte new file mode 100644 index 0000000000..0eea7956a3 --- /dev/null +++ b/plugins/calendar-resources/src/components/ConnectApp.svelte @@ -0,0 +1,8 @@ + + diff --git a/plugins/calendar-resources/src/components/IntegrationConnect.svelte b/plugins/calendar-resources/src/components/IntegrationConnect.svelte index 9ed9e38edc..0958413797 100644 --- a/plugins/calendar-resources/src/components/IntegrationConnect.svelte +++ b/plugins/calendar-resources/src/components/IntegrationConnect.svelte @@ -19,6 +19,7 @@ import calendar from '../plugin' import { concatLink } from '@hcengineering/core' import presentation from '@hcengineering/presentation' + import { calendarId } from '@hcengineering/calendar' const dispatch = createEventDispatcher() @@ -30,7 +31,7 @@ const link = concatLink(calendarUrl, '/signin') const url = new URL(link) url.search = new URLSearchParams({ - redirectURL: (getMetadata(presentation.metadata.FrontUrl) ?? window.location.origin) + window.location.pathname + redirectURL: (getMetadata(presentation.metadata.FrontUrl) ?? window.location.origin) + `/${calendarId}` }).toString() const res = await fetch(url.toString(), { @@ -61,6 +62,7 @@
- {#if integration} + {#if integration && integration.value !== ''} {integration.value} {:else}