From c235d0d83df6205c1d07c9d95c7b13fc2f2f958e Mon Sep 17 00:00:00 2001 From: Alexey Zinoviev Date: Mon, 6 Oct 2025 11:50:39 +0400 Subject: [PATCH 1/5] Qfix: ai assistant desktop (#10031) Signed-off-by: Alexey Zinoviev --- desktop/src/ui/platform.ts | 1 + dev/prod/src/platform.ts | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/desktop/src/ui/platform.ts b/desktop/src/ui/platform.ts index e7580f8f86..1f2e747293 100644 --- a/desktop/src/ui/platform.ts +++ b/desktop/src/ui/platform.ts @@ -423,6 +423,7 @@ export async function configurePlatform (onWorkbenchConnect?: () => Promise import(/* webpackChunkName: "achievement" */ '@hcengineering/emoji-resources')) addLocation(billingId, () => import(/* webpackChunkName: "billing" */ '@hcengineering/billing-resources')) addLocation(hulyMailId, () => import(/* webpackChunkName: "huly-mail" */ '@hcengineering/huly-mail-resources')) + addLocation(aiAssistantId, () => import(/* webpackChunkName: "ai-assistant" */ '@hcengineering/ai-assistant-resources')) setMetadata(client.metadata.FilterModel, 'ui') setMetadata(client.metadata.ExtraPlugins, ['preference' as Plugin]) diff --git a/dev/prod/src/platform.ts b/dev/prod/src/platform.ts index 75540ba236..8022d41ce2 100644 --- a/dev/prod/src/platform.ts +++ b/dev/prod/src/platform.ts @@ -585,10 +585,10 @@ export async function configurePlatform() { addLocation(processId, () => import(/* webpackChunkName: "process" */ '@hcengineering/process-resources')) addLocation(achievementId, () => import(/* webpackChunkName: "achievement" */ '@hcengineering/achievement-resources')) addLocation(communicationId, () => import(/* webpackChunkName: "communication" */ '@hcengineering/communication-resources')) - addLocation(emojiId, () => import(/* webpackChunkName: "achievement" */ '@hcengineering/emoji-resources')) - addLocation(billingId, () => import(/* webpackChunkName: "achievement" */ '@hcengineering/billing-resources')) - addLocation(hulyMailId, () => import(/* webpackChunkName: "achievement" */ '@hcengineering/huly-mail-resources')) - addLocation(aiAssistantId, () => import(/* webpackChunkName: "achievement" */ '@hcengineering/ai-assistant-resources')) + addLocation(emojiId, () => import(/* webpackChunkName: "emoji" */ '@hcengineering/emoji-resources')) + addLocation(billingId, () => import(/* webpackChunkName: "billing" */ '@hcengineering/billing-resources')) + addLocation(hulyMailId, () => import(/* webpackChunkName: "hulyMail" */ '@hcengineering/huly-mail-resources')) + addLocation(aiAssistantId, () => import(/* webpackChunkName: "ai-assistant" */ '@hcengineering/ai-assistant-resources')) setMetadata(client.metadata.FilterModel, 'ui') setMetadata(client.metadata.ExtraPlugins, ['preference' as Plugin]) From e7ff7c09583b66e992d2dad13e808de88124e2bf Mon Sep 17 00:00:00 2001 From: Alexey Zinoviev Date: Mon, 6 Oct 2025 14:42:52 +0400 Subject: [PATCH 2/5] UBERF-13864: Fix social id presenter (#10035) --- .../components/SocialIdentityPresenter.svelte | 19 +++++++++++++++---- plugins/contact-resources/src/index.ts | 3 ++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/plugins/contact-resources/src/components/SocialIdentityPresenter.svelte b/plugins/contact-resources/src/components/SocialIdentityPresenter.svelte index f2649009d1..0d9d88e72e 100644 --- a/plugins/contact-resources/src/components/SocialIdentityPresenter.svelte +++ b/plugins/contact-resources/src/components/SocialIdentityPresenter.svelte @@ -14,12 +14,13 @@ --> {#if socialIdProvider != null} -
-
+
+
+ +
{value.displayValue ?? value.value}
-
+ {#if shouldShowAvatar} +
+ {/if}
{/if} diff --git a/plugins/contact-resources/src/index.ts b/plugins/contact-resources/src/index.ts index af77fd4250..27a2116cf3 100644 --- a/plugins/contact-resources/src/index.ts +++ b/plugins/contact-resources/src/index.ts @@ -402,7 +402,8 @@ export default async (): Promise => ({ ContactNamePresenter, PersonIdFilter, AssigneePopup, - TranslationSettings + TranslationSettings, + SocialIdentityPresenter }, completion: { EmployeeQuery: async ( From 136ce0fb9048cec379780edbc8861e1d96f8049b Mon Sep 17 00:00:00 2001 From: Kristina Date: Mon, 6 Oct 2025 19:17:59 +0400 Subject: [PATCH 3/5] Show emojis in mentions (#10034) Signed-off-by: Kristina Fefelova --- packages/core/src/classes.ts | 1 + .../src/components/IconWithEmoji.svelte | 22 +++++- .../src/components/markup/ObjectNode.svelte | 13 +++- packages/theme/styles/common.scss | 2 +- .../activity/ActivityObjectValue.svelte | 16 +++-- .../src/components/extension/reference.ts | 69 +++++++++++++++++-- .../src/components/ObjectMention.svelte | 10 ++- 7 files changed, 112 insertions(+), 21 deletions(-) diff --git a/packages/core/src/classes.ts b/packages/core/src/classes.ts index 55c570ee9c..4a71a0ff9b 100644 --- a/packages/core/src/classes.ts +++ b/packages/core/src/classes.ts @@ -125,6 +125,7 @@ export type PropertyType = any export interface UXObject extends Obj { label: IntlString icon?: Asset + color?: number hidden?: boolean readonly?: boolean } diff --git a/packages/presentation/src/components/IconWithEmoji.svelte b/packages/presentation/src/components/IconWithEmoji.svelte index 1f88bf0459..b97d033b2e 100644 --- a/packages/presentation/src/components/IconWithEmoji.svelte +++ b/packages/presentation/src/components/IconWithEmoji.svelte @@ -19,6 +19,7 @@ export let icon: number | number[] | Ref export let size: IconSize + export let inline: boolean = false let value: string | undefined = parseIcon(icon) @@ -39,7 +40,7 @@ $: value = parseIcon(icon) -
+ {#if value !== undefined} {value} {:else} @@ -47,7 +48,7 @@ icon {/await} {/if} -
+