From d90e19bad093b9da88eb639178a6ebaec796be8f Mon Sep 17 00:00:00 2001
From: Andrew Simachev <andrew.simachev@gmail.com>
Date: Thu, 27 Feb 2025 20:57:19 +0100
Subject: [PATCH] JS-6487: fix

---
 src/ts/component/menu/block/relation/edit.tsx      | 10 ++++++----
 src/ts/component/sidebar/section/type/relation.tsx |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/ts/component/menu/block/relation/edit.tsx b/src/ts/component/menu/block/relation/edit.tsx
index 12d47d5710..cc29517d57 100644
--- a/src/ts/component/menu/block/relation/edit.tsx
+++ b/src/ts/component/menu/block/relation/edit.tsx
@@ -34,7 +34,6 @@ const MenuBlockRelationEdit = observer(class MenuBlockRelationEdit extends React
 
 		const relation = this.getRelation();
 		const root = S.Block.getLeaf(rootId, rootId);
-		const isDate = this.format == I.RelationType.Date;
 		const isObject = this.format == I.RelationType.Object;
 		const isReadonly = this.isReadonly();
 
@@ -59,8 +58,11 @@ const MenuBlockRelationEdit = observer(class MenuBlockRelationEdit extends React
 				canDuplicate = canDelete = false;
 			};
 		};
-		if (relation && Relation.isSystemWithoutUser(relation.relationKey)) {
-			canDelete = false;
+
+		if (relation) {
+			const allowedDelete = relation ? S.Block.isAllowed(relation.restrictions, [ I.RestrictionObject.Delete ]) : false;
+
+			canDelete = allowedDelete && Relation.isSystemWithoutUser(relation.relationKey);
 		};
 
 		switch (ref) {
@@ -155,7 +157,7 @@ const MenuBlockRelationEdit = observer(class MenuBlockRelationEdit extends React
 					<div className="section">
 						<MenuItemVertical icon="expand" name={translate('commonOpenObject')} onClick={this.onOpen} onMouseEnter={this.menuClose} />
 						{canDuplicate ? <MenuItemVertical icon="copy" name={translate('commonDuplicate')} onClick={this.onCopy} onMouseEnter={this.menuClose} /> : ''}
-						{canDelete && unlinkText && !noUnlink ? <MenuItemVertical icon="unlink" name={unlinkText} onClick={this.onUnlink} onMouseEnter={this.menuClose} /> : ''}
+						{unlinkText && !noUnlink ? <MenuItemVertical icon="unlink" name={unlinkText} onClick={this.onUnlink} onMouseEnter={this.menuClose} /> : ''}
 						{canDelete ? <MenuItemVertical icon="remove" name={translate('commonDelete')} onClick={this.onRemove} onMouseEnter={this.menuClose} /> : ''}
 					</div>
 				) : ''}
diff --git a/src/ts/component/sidebar/section/type/relation.tsx b/src/ts/component/sidebar/section/type/relation.tsx
index 50fe58a3af..2f3d82fb59 100644
--- a/src/ts/component/sidebar/section/type/relation.tsx
+++ b/src/ts/component/sidebar/section/type/relation.tsx
@@ -68,7 +68,7 @@ const SidebarSectionTypeRelation = observer(forwardRef<I.SidebarSectionRef, I.Si
 
 	const onAdd = (e: any, id: string) => {
 		const list = lists.find(it => it.id == id);
-		const keys = lists.reduce((acc, it) => acc.concat(it.data.map(it => it.relationKey)), []);
+		const keys = lists.reduce((acc, it) => acc.concat(it.data.map(it => it.relationKey)), []).concat('description');
 		const ids = list.data.map(it => it.id);
 
 		S.Menu.open('relationSuggest', {