From 93fca17b07911f3ebcaa773a7148be4464414eb2 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Fri, 16 Jan 2026 08:19:51 +0500
Subject: [PATCH] Fix view setting freeze (#10410)

* Fix view setting freeze

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>

* Fix formatting

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>

---------

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 .../components/settings/view/EditView.svelte  |  4 ++-
 .../settings/view/ViewSetting.svelte          | 28 ++++++++++++++++++-
 .../src/components/ViewletSetting.svelte      | 28 ++++++++++++++++++-
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/plugins/card-resources/src/components/settings/view/EditView.svelte b/plugins/card-resources/src/components/settings/view/EditView.svelte
index d069f1bff0..8007dbd86d 100644
--- a/plugins/card-resources/src/components/settings/view/EditView.svelte
+++ b/plugins/card-resources/src/components/settings/view/EditView.svelte
@@ -31,8 +31,10 @@
 
   const client = getClient()
 
+  const origin = client.getHierarchy().clone(viewlet)
+
   async function save (): Promise<void> {
-    await client.diffUpdate(viewlet, {
+    await client.diffUpdate(origin, {
       title,
       descriptor: type,
       config: viewlet.config
diff --git a/plugins/card-resources/src/components/settings/view/ViewSetting.svelte b/plugins/card-resources/src/components/settings/view/ViewSetting.svelte
index cd201344cc..58e72ab0df 100644
--- a/plugins/card-resources/src/components/settings/view/ViewSetting.svelte
+++ b/plugins/card-resources/src/components/settings/view/ViewSetting.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { createEventDispatcher } from 'svelte'
 
-  import core, { AnyAttribute, Association, AssociationQuery, Class, Doc, Ref, Type } from '@hcengineering/core'
+  import core, { AnyAttribute, Association, AssociationQuery, Class, Client, Doc, Ref, Type } from '@hcengineering/core'
   import { Asset, getEmbeddedLabel, IntlString } from '@hcengineering/platform'
   import { getAttributePresenterClass, getClient, hasResource } from '@hcengineering/presentation'
   import { resizeObserver } from '@hcengineering/ui'
@@ -57,6 +57,22 @@
     }
   }
 
+  function getAssoctiationLabel (client: Client, param: string): IntlString {
+    const model = client.getModel()
+    const associations = param.split('$associations.')
+    const resultLabels = associations
+      .map((r) => {
+        const parts = r.split('_')
+        if (parts.length !== 2) return ''
+        const assoc = model.findObject(parts[0] as Ref<Association>)
+        if (assoc === undefined) return ''
+        return parts[1] === '1' ? assoc.nameA : assoc.nameB
+      })
+      .filter((it) => it.length > 0)
+
+    return getEmbeddedLabel(resultLabels.join(' › '))
+  }
+
   function getBaseConfig (viewlet: Viewlet): Config[] {
     const lookup = buildConfigLookup(hierarchy, viewlet.attachTo, viewlet.config, viewlet.options?.lookup)
     const result: Config[] = []
@@ -67,6 +83,16 @@
         if (viewlet.configOptions?.hiddenKeys?.includes(param)) continue
         if (param.length === 0) {
           result.push(getObjectConfig(viewlet.attachTo, param))
+        } else if (param.startsWith('$associations.')) {
+          const assocConfig: AttributeConfig = {
+            type: 'attribute',
+            value: param,
+            enabled: true,
+            label: getAssoctiationLabel(client, param),
+            _class: viewlet.attachTo,
+            icon: clazz.icon
+          }
+          result.push(assocConfig)
         } else {
           const attrCfg: AttributeConfig = {
             type: 'attribute',
diff --git a/plugins/view-resources/src/components/ViewletSetting.svelte b/plugins/view-resources/src/components/ViewletSetting.svelte
index 80e92e25a2..1a835298eb 100644
--- a/plugins/view-resources/src/components/ViewletSetting.svelte
+++ b/plugins/view-resources/src/components/ViewletSetting.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import core, { AnyAttribute, Association, AssociationQuery, Class, Doc, Ref, Type } from '@hcengineering/core'
+  import core, { AnyAttribute, Association, AssociationQuery, Class, Client, Doc, Ref, Type } from '@hcengineering/core'
   import { Asset, getEmbeddedLabel, IntlString } from '@hcengineering/platform'
   import { createQuery, getAttributePresenterClass, getClient, hasResource } from '@hcengineering/presentation'
   import { DropdownLabelsIntl, Loading, resizeObserver } from '@hcengineering/ui'
@@ -97,6 +97,22 @@
     }
   }
 
+  function getAssoctiationLabel (client: Client, param: string): IntlString {
+    const model = client.getModel()
+    const associations = param.split('$associations.')
+    const resultLabels = associations
+      .map((r) => {
+        const parts = r.split('_')
+        if (parts.length !== 2) return ''
+        const assoc = model.findObject(parts[0] as Ref<Association>)
+        if (assoc === undefined) return ''
+        return parts[1] === '1' ? assoc.nameA : assoc.nameB
+      })
+      .filter((it) => it.length > 0)
+
+    return getEmbeddedLabel(resultLabels.join(' › '))
+  }
+
   function getBaseConfig (viewlet: Viewlet): Config[] {
     const config = defaultConfig ?? viewlet.config
     const lookup = buildConfigLookup(hierarchy, viewlet.attachTo, config, viewlet.options?.lookup)
@@ -109,6 +125,16 @@
         if (viewlet.configOptions?.hiddenKeys?.includes(param)) continue
         if (param.length === 0) {
           result.push(getObjectConfig(viewlet.attachTo, param))
+        } else if (param.startsWith('$associations.')) {
+          const assocConfig: AttributeConfig = {
+            type: 'attribute',
+            value: param,
+            enabled: true,
+            label: getAssoctiationLabel(client, param),
+            _class: viewlet.attachTo,
+            icon: clazz.icon
+          }
+          result.push(assocConfig)
         } else {
           const paramValue = param.startsWith('custom') ? { key: param, displayProps: { optional: true } } : param
           const attrCfg: AttributeConfig = {