From eec5c8f02fc72abc2245005aba280e9c5ac247f4 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Mon, 5 Jan 2026 04:09:07 +0500
Subject: [PATCH] use versioning selector for relations (#10360)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 .../src/components/ObjectBoxPopup.svelte              |  1 +
 .../src/components/RelationEditor.svelte              | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/view-resources/src/components/ObjectBoxPopup.svelte b/plugins/view-resources/src/components/ObjectBoxPopup.svelte
index 09e6246df2..839db61baf 100644
--- a/plugins/view-resources/src/components/ObjectBoxPopup.svelte
+++ b/plugins/view-resources/src/components/ObjectBoxPopup.svelte
@@ -50,6 +50,7 @@
   {groupBy}
   bind:selectedObjects
   bind:ignoreObjects
+  showVersions
   {shadows}
   {create}
   on:update
diff --git a/plugins/view-resources/src/components/RelationEditor.svelte b/plugins/view-resources/src/components/RelationEditor.svelte
index 690f1aae70..c5ceccf311 100644
--- a/plugins/view-resources/src/components/RelationEditor.svelte
+++ b/plugins/view-resources/src/components/RelationEditor.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
   import core, { Association, Doc, WithLookup } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
-  import { createQuery, getClient, ObjectCreate } from '@hcengineering/presentation'
+  import { getClient, ObjectCreate } from '@hcengineering/presentation'
   import { Button, IconAdd, Label, Scroller, Section, showPopup } from '@hcengineering/ui'
+  import { Viewlet, ViewletPreference } from '@hcengineering/view'
   import { showMenu } from '../actions'
-  import { Viewlet, ViewletPreference, ViewOptions } from '@hcengineering/view'
+  import view from '../plugin'
   import DocTable from './DocTable.svelte'
   import ObjectBoxPopup from './ObjectBoxPopup.svelte'
-  import view from '../plugin'
   import ViewletsSettingButton from './ViewletsSettingButton.svelte'
 
   export let object: Doc
@@ -36,11 +36,14 @@
 
   function add (): void {
     const create = getCreate()
+    const isVersionable = client.getHierarchy().classHierarchyMixin(_class, core.mixin.VersionableClass) !== undefined
+    const baseQuery = { _id: { $nin: docs.map((p) => p._id) } }
+    const docQuery = isVersionable ? { isLatest: true, ...baseQuery } : baseQuery
     showPopup(
       ObjectBoxPopup,
       {
         _class,
-        docQuery: { _id: { $nin: docs.map((p) => p._id) } },
+        docQuery,
         docProps: {
           shouldShowAvatar: true
         },