Skip to content

Show card content diff #10151

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 26, 2025
Merged

Show card content diff #10151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d10df48
Show card content diff
BykhovDenis Oct 25, 2025
be44cd4
Fix formatting
BykhovDenis Oct 26, 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
1,004 changes: 503 additions & 501 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
"electron-updater": "^6.3.4",
"livekit-client": "^2.15.6",
"@hcengineering/server-backup": "^0.7.0",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"ws": "^8.18.2"
},
"productName": "Huly Desktop",
Expand Down
2 changes: 1 addition & 1 deletion dev/tool/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
"@hcengineering/api-client": "^0.7.5",
"@faker-js/faker": "^8.4.1",
"@hcengineering/hulylake-client": "^0.7.6",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/pod-rating": "^0.7.0"
}
}
2 changes: 1 addition & 1 deletion models/communication/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@hcengineering/card": "^0.7.0",
"@hcengineering/communication": "^0.7.0",
"@hcengineering/communication-resources": "^0.7.0",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/contact": "^0.7.0",
"@hcengineering/core": "^0.7.10",
"@hcengineering/model": "^0.7.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/presentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"@hcengineering/contact": "^0.7.0",
"@hcengineering/collaborator-client": "^0.7.5",
"@hcengineering/communication-client-query": "^0.7.8",
"@hcengineering/communication-sdk-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-sdk-types": "^0.7.9",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/communication-shared": "^0.7.8",
"@hcengineering/core": "^0.7.10",
"@hcengineering/diffview": "^0.7.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/activity-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@hcengineering/ui": "^0.7.0",
"@hcengineering/view": "^0.7.0",
"@hcengineering/view-resources": "^0.7.0",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/emoji": "^0.7.0",
"@hcengineering/emoji-resources": "^0.7.0",
"svelte": "^4.2.20"
Expand Down
2 changes: 1 addition & 1 deletion plugins/card-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"@hcengineering/presence": "^0.7.0",
"@hcengineering/presentation": "^0.7.0",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/communication-resources": "^0.7.0",
"@hcengineering/core": "^0.7.10",
"@hcengineering/ui": "^0.7.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/chat-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@hcengineering/card": "^0.7.0",
"@hcengineering/card-resources": "^0.7.0",
"@hcengineering/chat": "^0.7.0",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/communication": "^0.7.0",
"@hcengineering/contact": "^0.7.0",
"@hcengineering/contact-resources": "^0.7.0",
Expand Down
3 changes: 2 additions & 1 deletion plugins/communication-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,14 @@
},
"dependencies": {
"@hcengineering/analytics": "^0.7.5",
"@hcengineering/activity": "^0.7.0",
"@hcengineering/ai-bot": "^0.7.0",
"@hcengineering/ai-bot-resources": "^0.7.0",
"@hcengineering/attachment-resources": "^0.7.0",
"@hcengineering/card": "^0.7.0",
"@hcengineering/chat": "^0.7.0",
"@hcengineering/communication": "^0.7.0",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/communication-shared": "^0.7.8",
"@hcengineering/contact": "^0.7.0",
"@hcengineering/contact-resources": "^0.7.0",
Expand Down
18 changes: 12 additions & 6 deletions plugins/communication-resources/src/activity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
import core, { type Class, type Client, type Doc, type Mixin, type Ref } from '@hcengineering/core'
import view, { type AttributeModel } from '@hcengineering/view'
import { buildRemovedDoc, getAttributePresenter } from '@hcengineering/view-resources'
import { type Card } from '@hcengineering/card'
import {
type ActivityAttributeUpdate,
type ActivityMessage,
type ActivityUpdate,
ActivityUpdateType,
type Message,
MessageType
} from '@hcengineering/communication-types'
import core, { type Class, type Client, type Doc, type Mixin, type Ref } from '@hcengineering/core'
import view, { type AttributeModel } from '@hcengineering/view'
import { buildRemovedDoc, getAttributePresenter } from '@hcengineering/view-resources'

const valueTypes: ReadonlyArray<Ref<Class<Doc>>> = [
core.class.TypeString,
Expand Down Expand Up @@ -52,13 +53,18 @@ export async function getAttributeModel (
update: ActivityUpdate | undefined,
_class: Ref<Class<Card>>
): Promise<AttributeModel | undefined> {
if (update == null || update.type !== ActivityUpdateType.Attribute) return undefined
if (
update == null ||
(update.type !== ActivityUpdateType.Attribute && update.type !== ActivityUpdateType.CollaborativeChange)
) {
return undefined
}

const { attrKey } = update

const model = await getAttributePresenterSafe(
client,
update.mixin ?? _class,
(update as ActivityAttributeUpdate).mixin ?? _class,
attrKey,
view.mixin.ActivityAttributePresenter
)
Expand All @@ -67,7 +73,7 @@ export async function getAttributeModel (
return model
}

return await getAttributePresenterSafe(client, update.mixin ?? _class, attrKey)
return await getAttributePresenterSafe(client, (update as ActivityAttributeUpdate).mixin ?? _class, attrKey)
}

export async function getAttributeValues (
Expand Down
97 changes: 97 additions & 0 deletions ...ation-resources/src/components/message/activity/ActivityCollaborativeContentViewer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<!--
// Copyright © 2025 Hardcore Engineering Inc.
//
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. You may
// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
//
// See the License for the specific language governing permissions and
// limitations under the License.
-->
<script lang="ts">
import { ActivityCollaborativeChange } from '@hcengineering/communication-types'
import { MarkupDiffPresenter } from '@hcengineering/view-resources'
import activity from '@hcengineering/activity'
import ui, { Label } from '@hcengineering/ui'
import { AttributeModel } from '@hcengineering/view'
import communication from '../../../plugin'

export let model: AttributeModel | undefined = undefined
export let update: ActivityCollaborativeChange

$: isTooLarge = update.value === activity.string.ValueTooLarge || update.prevValue === activity.string.ValueTooLarge

let isDiffShown = false

function toggleShowMore (): void {
isDiffShown = !isDiffShown
}
</script>

<div>
{#if model !== undefined}
<Label label={model.label} />
<span class="lower"><Label label={activity.string.Edited} /></span>
{/if}
{#if isTooLarge}
<div class="unset row overflow-label">
<Label label={activity.string.ValueTooLarge} />
</div>
{:else}
<div class="showMore" on:click={toggleShowMore}>
<div class="triangle" class:left={!isDiffShown} class:down={isDiffShown} />
<Label label={isDiffShown ? ui.string.ShowLess : ui.string.ShowMore} />
</div>
{/if}
</div>
{#if isDiffShown}
<MarkupDiffPresenter value={update.value} prevValue={update.prevValue} />
{/if}

<style lang="scss">
.showMore {
color: var(--global-primary-LinkColor);
cursor: pointer;
display: flex;
align-items: center;
font-weight: 500;
gap: 0.5rem;

.triangle {
width: 0;
height: 0;

&.left {
border-top: 0.25rem solid transparent;
border-bottom: 0.25rem solid transparent;
border-left: 0.25rem solid var(--global-primary-LinkColor);
border-right: none;
}

&.down {
border-left: 0.25rem solid transparent;
border-right: 0.25rem solid transparent;
border-top: 0.25rem solid var(--global-primary-LinkColor);
border-bottom: none;
}
}

&:hover {
color: var(--global-focus-BorderColor);

.triangle {
&.left {
border-left-color: var(--global-focus-BorderColor);
}

&.down {
border-top-color: var(--global-focus-BorderColor);
}
}
}
}
</style>
3 changes: 3 additions & 0 deletions plugins/communication-resources/src/components/message/activity/ActivityUpdateViewer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import { Card } from '@hcengineering/card'
import ActivityUpdateTypeViewer from './ActivityUpdateTypeViewer.svelte'
import ActivityUpdateProcessViewer from './ActivityUpdateProcessViewer.svelte'
import ActivityCollaborativeContentViewer from './ActivityCollaborativeContentViewer.svelte'

export let model: AttributeModel | undefined = undefined
export let update: ActivityUpdate
Expand All @@ -41,4 +42,6 @@
<ActivityUpdateTypeViewer {update} />
{:else if update.type === ActivityUpdateType.Process}
<ActivityUpdateProcessViewer {update} {content} />
{:else if update.type === ActivityUpdateType.CollaborativeChange}
<ActivityCollaborativeContentViewer {model} {update} />
{/if}
2 changes: 1 addition & 1 deletion plugins/communication/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"dependencies": {
"@hcengineering/platform": "^0.7.5",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/core": "^0.7.10",
"@hcengineering/contact": "^0.7.0",
"@hcengineering/ui": "^0.7.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/inbox-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@hcengineering/card": "^0.7.0",
"@hcengineering/communication": "^0.7.0",
"@hcengineering/communication-resources": "^0.7.0",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/communication-shared": "^0.7.8",
"@hcengineering/contact": "^0.7.0",
"@hcengineering/contact-resources": "^0.7.0",
Expand Down
2 changes: 1 addition & 1 deletion plugins/workbench-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@hcengineering/support-resources": "^0.7.0",
"@hcengineering/view-resources": "^0.7.0",
"@hcengineering/inbox": "^0.7.0",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"fast-copy": "^3.0.2",
"@hcengineering/analytics": "^0.7.5",
"@hcengineering/account-client": "^0.7.7",
Expand Down
4 changes: 2 additions & 2 deletions pods/fulltext/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
"@hcengineering/postgres": "^0.7.9",
"@hcengineering/mongo": "^0.7.8",
"@hcengineering/kafka": "^0.7.8",
"@hcengineering/communication-server": "^0.7.8",
"@hcengineering/communication-sdk-types": "^0.7.8",
"@hcengineering/communication-server": "^0.7.9",
"@hcengineering/communication-sdk-types": "^0.7.9",
"@hcengineering/hulylake-client": "^0.7.6"
}
}
4 changes: 2 additions & 2 deletions pods/media/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"@hcengineering/server-token": "^0.7.5",
"@hcengineering/attachment": "^0.7.0",
"@hcengineering/drive": "^0.7.0",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-sdk-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/communication-sdk-types": "^0.7.9",
"dotenv": "~16.0.0",
"kafkajs": "^2.2.4"
}
Expand Down
4 changes: 2 additions & 2 deletions pods/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
"dependencies": {
"@hcengineering/analytics": "^0.7.5",
"@hcengineering/analytics-service": "^0.7.5",
"@hcengineering/communication-server": "^0.7.8",
"@hcengineering/communication-sdk-types": "^0.7.8",
"@hcengineering/communication-server": "^0.7.9",
"@hcengineering/communication-sdk-types": "^0.7.9",
"@hcengineering/contact": "^0.7.0",
"@hcengineering/core": "^0.7.10",
"@hcengineering/kafka": "^0.7.8",
Expand Down
4 changes: 2 additions & 2 deletions server-plugins/activity-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
"@hcengineering/server-core": "^0.7.8",
"@hcengineering/server-notification-resources": "^0.7.0",
"@hcengineering/text-core": "^0.7.5",
"@hcengineering/communication-sdk-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-sdk-types": "^0.7.9",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/server-card": "^0.7.0"
}
}
4 changes: 2 additions & 2 deletions server-plugins/card-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
"@hcengineering/core": "^0.7.10",
"@hcengineering/platform": "^0.7.5",
"@hcengineering/server-core": "^0.7.8",
"@hcengineering/communication-types": "^0.7.8",
"@hcengineering/communication-sdk-types": "^0.7.8",
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/communication-sdk-types": "^0.7.9",
"@hcengineering/communication": "^0.7.0",
"@hcengineering/server-contact": "^0.7.0",
"@hcengineering/contact": "^0.7.0"
Expand Down
2 changes: 2 additions & 0 deletions server/collaborator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
"@types/jest": "^29.5.5"
},
"dependencies": {
"@hcengineering/communication-types": "^0.7.9",
"@hcengineering/communication-sdk-types": "^0.7.9",
"@hcengineering/activity": "^0.7.0",
"@hcengineering/analytics": "^0.7.5",
"@hcengineering/core": "^0.7.10",
Expand Down
Loading
Loading