From 3ca2fcce44b9fe39b236e1b64deee846b5d05ada Mon Sep 17 00:00:00 2001 From: Denis Bykhov Date: Thu, 5 Oct 2023 08:09:59 +0600 Subject: [PATCH] UBER-979 (#3788) Signed-off-by: Denis Bykhov --- dev/generator/package.json | 10 ++--- dev/prod/package.json | 42 +++++++++--------- dev/prod/src/platform.ts | 3 +- dev/tool/package.json | 12 ++--- models/automation/package.json | 2 +- models/bitrix/package.json | 4 +- models/board/package.json | 4 +- models/calendar/package.json | 6 +-- models/chunter/package.json | 4 +- models/contact/package.json | 4 +- models/gmail/package.json | 6 +-- models/hr/package.json | 4 +- models/inventory/package.json | 4 +- models/lead/package.json | 6 +-- models/notification/package.json | 6 +-- models/recruit/package.json | 10 ++--- models/request/package.json | 6 +-- models/server-calendar/package.json | 2 +- models/server-chunter/package.json | 4 +- models/server-gmail/package.json | 4 +- models/server-hr/package.json | 2 +- models/server-lead/package.json | 2 +- models/server-notification/package.json | 2 +- models/server-recruit/package.json | 2 +- models/server-setting/package.json | 2 +- models/server-task/package.json | 2 +- models/server-telegram/package.json | 4 +- models/server-tracker/package.json | 4 +- models/setting/package.json | 6 +-- models/setting/src/index.ts | 1 + models/task/package.json | 4 +- models/telegram/package.json | 6 +-- models/templates/package.json | 2 +- models/tracker/package.json | 8 ++-- packages/kanban/package.json | 2 +- packages/panel/package.json | 6 +-- plugins/activity-resources/package.json | 4 +- plugins/attachment-resources/package.json | 2 +- plugins/bitrix-assets/package.json | 2 +- plugins/bitrix-resources/package.json | 10 ++--- plugins/bitrix/package.json | 10 ++--- plugins/board-assets/package.json | 4 +- plugins/board-resources/package.json | 12 ++--- plugins/board/package.json | 4 +- plugins/calendar-assets/assets/permission.png | Bin 0 -> 31775 bytes plugins/calendar-assets/lang/en.json | 5 ++- plugins/calendar-assets/lang/ru.json | 5 ++- plugins/calendar-assets/package.json | 4 +- plugins/calendar-assets/src/index.ts | 6 +++ plugins/calendar-resources/package.json | 6 +-- .../src/components/ConnectApp.svelte | 8 ++++ .../src/components/IntegrationConnect.svelte | 16 +++++-- plugins/calendar-resources/src/index.ts | 4 +- plugins/calendar/package.json | 6 +-- plugins/calendar/src/index.ts | 9 +++- plugins/chunter-assets/package.json | 4 +- plugins/chunter-resources/package.json | 4 +- plugins/chunter/package.json | 4 +- plugins/contact-resources/package.json | 6 +-- plugins/devmodel-resources/package.json | 2 +- plugins/gmail-assets/package.json | 2 +- plugins/gmail-resources/package.json | 8 ++-- plugins/gmail/package.json | 6 +-- plugins/hr-assets/package.json | 4 +- plugins/hr-resources/package.json | 10 ++--- plugins/hr/package.json | 4 +- plugins/inventory-resources/package.json | 2 +- plugins/lead-resources/package.json | 6 +-- plugins/lead/package.json | 2 +- plugins/login-resources/package.json | 2 +- plugins/notification-assets/package.json | 4 +- plugins/notification-resources/package.json | 4 +- plugins/notification/package.json | 4 +- plugins/recruit-assets/package.json | 4 +- plugins/recruit-resources/package.json | 14 +++--- plugins/recruit/package.json | 8 ++-- plugins/request-assets/package.json | 2 +- plugins/request-resources/package.json | 4 +- plugins/request/package.json | 4 +- plugins/setting-assets/lang/en.json | 1 + plugins/setting-assets/lang/ru.json | 1 + plugins/setting-assets/package.json | 4 +- plugins/setting-resources/package.json | 6 +-- .../src/components/PluginCard.svelte | 29 ++++++------ plugins/setting-resources/src/plugin.ts | 1 + plugins/setting/package.json | 2 +- plugins/setting/src/index.ts | 1 + plugins/task-assets/package.json | 4 +- plugins/task-resources/package.json | 8 ++-- plugins/task/package.json | 4 +- plugins/telegram-assets/package.json | 2 +- plugins/telegram-resources/package.json | 8 ++-- plugins/telegram/package.json | 6 +-- plugins/tracker-assets/package.json | 2 +- plugins/tracker-resources/package.json | 14 +++--- plugins/tracker/package.json | 6 +-- plugins/tracker/src/index.ts | 2 +- plugins/view-resources/package.json | 8 ++-- plugins/workbench-resources/package.json | 8 ++-- pods/server/package.json | 42 +++++++++--------- .../calendar-resources/package.json | 2 +- server-plugins/chunter-resources/package.json | 4 +- server-plugins/contact-resources/package.json | 2 +- server-plugins/gmail-resources/package.json | 4 +- server-plugins/hr-resources/package.json | 4 +- .../notification-resources/package.json | 4 +- server-plugins/notification/package.json | 2 +- server-plugins/openai/package.json | 4 +- server-plugins/recruit-resources/package.json | 2 +- server-plugins/request-resources/package.json | 4 +- server-plugins/setting-resources/package.json | 4 +- server-plugins/task-resources/package.json | 4 +- .../telegram-resources/package.json | 4 +- server-plugins/tracker-resources/package.json | 8 ++-- 114 files changed, 339 insertions(+), 301 deletions(-) create mode 100644 plugins/calendar-assets/assets/permission.png create mode 100644 plugins/calendar-resources/src/components/ConnectApp.svelte 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 0000000000000000000000000000000000000000..7d0af948c23e1de5f57f4a11693c8fb555180c4a GIT binary patch literal 31775 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 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}
{#if (integration?.value ?? '') === ''} @@ -103,7 +100,7 @@