Select relation when create new version (#10372)

BykhovDenis · web-flow · commit b89613780d8f · 2026-01-07T23:14:59.000+05:00
Signed-off-by: Denis Bykhov &lt;bykhov.denis@gmail.com&gt;
diff --git a/plugins/card-assets/lang/cs.json b/plugins/card-assets/lang/cs.json
@@ -67,6 +67,7 @@
     "Versioning": "Verzování",
     "EnableVersioning": "Povolit verzování",
     "EnableVersioningConfirm": "Chcete povolit verzování?",
-    "NewVersionConfirmation": "Chcete vytvořit novou verzi?"
+    "NewVersionConfirmation": "Chcete vytvořit novou verzi?",
+    "RelationCopyDescr": "Které vztahy chcete zkopírovat?"
   }
 }
diff --git a/plugins/card-assets/lang/de.json b/plugins/card-assets/lang/de.json
@@ -67,6 +67,7 @@
     "Versioning": "Versionsverwaltung",
     "EnableVersioning": "Versionsverwaltung aktivieren",
     "EnableVersioningConfirm": "Möchten Sie die Versionsverwaltung aktivieren?",
-    "NewVersionConfirmation": "Möchten Sie eine neue Version erstellen?"
+    "NewVersionConfirmation": "Möchten Sie eine neue Version erstellen?",
+    "RelationCopyDescr": "Welche Beziehungen möchten Sie kopieren?"
   }
 }
diff --git a/plugins/card-assets/lang/en.json b/plugins/card-assets/lang/en.json
@@ -67,6 +67,7 @@
     "Versioning": "Versioning",
     "EnableVersioning": "Enable versioning",
     "EnableVersioningConfirm": "Do you want to enable versioning?",
-    "NewVersionConfirmation": "Do you want to create a new version?"
+    "NewVersionConfirmation": "Do you want to create a new version?",
+    "RelationCopyDescr": "Which relations do you want to copy?"
   }
 }
diff --git a/plugins/card-assets/lang/es.json b/plugins/card-assets/lang/es.json
@@ -67,6 +67,7 @@
     "Versioning": "Versionado",
     "EnableVersioning": "Habilitar control de versiones",
     "EnableVersioningConfirm": "¿Desea habilitar el control de versiones?",
-    "NewVersionConfirmation": "¿Desea crear una nueva versión?"
+    "NewVersionConfirmation": "¿Desea crear una nueva versión?",
+    "RelationCopyDescr": "¿Qué relaciones quieres copiar?"
   }
 }
diff --git a/plugins/card-assets/lang/fr.json b/plugins/card-assets/lang/fr.json
@@ -67,6 +67,7 @@
     "Versioning": "Gestion des versions",
     "EnableVersioning": "Activer la gestion des versions",
     "EnableVersioningConfirm": "Voulez-vous activer la gestion des versions ?",
-    "NewVersionConfirmation": "Voulez-vous créer une nouvelle version ?"
+    "NewVersionConfirmation": "Voulez-vous créer une nouvelle version ?",
+    "RelationCopyDescr": "Quelles relations souhaitez-vous copier ?"
   }
 }
diff --git a/plugins/card-assets/lang/it.json b/plugins/card-assets/lang/it.json
@@ -67,6 +67,7 @@
     "Versioning": "Versionamento",
     "EnableVersioning": "Abilita versionamento",
     "EnableVersioningConfirm": "Vuoi abilitare il versionamento?",
-    "NewVersionConfirmation": "Vuoi creare una nuova versione?"
+    "NewVersionConfirmation": "Vuoi creare una nuova versione?",
+    "RelationCopyDescr": "Quali relazioni vuoi copiare?"
   }
 }
diff --git a/plugins/card-assets/lang/ja.json b/plugins/card-assets/lang/ja.json
@@ -67,6 +67,7 @@
     "Versioning": "バージョン管理",
     "EnableVersioning": "バージョン管理を有効にする",
     "EnableVersioningConfirm": "バージョン管理を有効にしますか？",
-    "NewVersionConfirmation": "新しいバージョンを作成しますか？"
+    "NewVersionConfirmation": "新しいバージョンを作成しますか？",
+    "RelationCopyDescr": "どの関連をコピーしますか？"
   }
 }
diff --git a/plugins/card-assets/lang/pt.json b/plugins/card-assets/lang/pt.json
@@ -67,6 +67,7 @@
     "Versioning": "Controle de versões",
     "EnableVersioning": "Ativar controle de versões",
     "EnableVersioningConfirm": "Deseja ativar o controle de versões?",
-    "NewVersionConfirmation": "Deseja criar uma nova versão?"
+    "NewVersionConfirmation": "Deseja criar uma nova versão?",
+    "RelationCopyDescr": "Quais relações você deseja copiar?"
   }
 }
diff --git a/plugins/card-assets/lang/ru.json b/plugins/card-assets/lang/ru.json
@@ -67,6 +67,7 @@
     "Versioning": "Управление версиями",
     "EnableVersioning": "Включить управление версиями",
     "EnableVersioningConfirm": "Вы хотите включить управление версиями?",
-    "NewVersionConfirmation": "Вы хотите создать новую версию?"
+    "NewVersionConfirmation": "Вы хотите создать новую версию?",
+    "RelationCopyDescr": "Какие связи вы хотите скопировать?"
   }
 }
diff --git a/plugins/card-assets/lang/tr.json b/plugins/card-assets/lang/tr.json
@@ -67,6 +67,7 @@
     "Versioning": "Sürümleme",
     "EnableVersioning": "Sürümlemeyi etkinleştir",
     "EnableVersioningConfirm": "Sürümlemeyi etkinleştirmek istiyor musunuz?",
-    "NewVersionConfirmation": "Yeni bir sürüm oluşturmak istiyor musunuz?"
+    "NewVersionConfirmation": "Yeni bir sürüm oluşturmak istiyor musunuz?",
+    "RelationCopyDescr": "Hangi ilişkileri kopyalamak istiyorsunuz?"
   }
 }
diff --git a/plugins/card-assets/lang/zh.json b/plugins/card-assets/lang/zh.json
@@ -67,6 +67,7 @@
     "Versioning": "版本控制",
     "EnableVersioning": "启用版本控制",
     "EnableVersioningConfirm": "您要启用版本控制吗？",
-    "NewVersionConfirmation": "您要创建一个新版本吗？"
+    "NewVersionConfirmation": "您想创建一个新版本吗？",
+    "RelationCopyDescr": "您想复制哪些关系？"
   }
 }
diff --git a/plugins/card-resources/src/components/CardVersionSelector.svelte b/plugins/card-resources/src/components/CardVersionSelector.svelte
@@ -17,10 +17,10 @@
 <script lang="ts">
   import { Card, cardId } from '@hcengineering/card'
   import core, { Ref } from '@hcengineering/core'
-  import { createQuery, getClient, MessageBox } from '@hcengineering/presentation'
+  import { createQuery, getClient } from '@hcengineering/presentation'
   import { Button, DropdownLabels, DropdownTextItem, getCurrentLocation, navigate, showPopup } from '@hcengineering/ui'
   import card from '../plugin'
-  import { createNewVersion } from '../utils'
+  import NewVersionPopup from './NewVersionPopup.svelte'
 
   export let value: Card
 
@@ -70,14 +70,9 @@
     }
   }
 
-  async function newVersion (): Promise<void> {
-    showPopup(MessageBox, {
-      label: card.string.NewVersion,
-      message: card.string.NewVersionConfirmation,
-      action: async () => {
-        const _id = await createNewVersion(value)
-        navigateTo(_id)
-      }
+  function newVersion (): void {
+    showPopup(NewVersionPopup, {
+      value
     })
   }
 </script>
diff --git a/plugins/card-resources/src/components/NewVersionPopup.svelte b/plugins/card-resources/src/components/NewVersionPopup.svelte
@@ -0,0 +1,106 @@
+<!--
+//
+// Copyright © 2026 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 { cardId, Card as CardType } from '@hcengineering/card'
+  import core from '@hcengineering/core'
+  import { Card, getClient } from '@hcengineering/presentation'
+  import { getCurrentLocation, Label, navigate, Toggle } from '@hcengineering/ui'
+  import plugin from '../plugin'
+  import { createNewVersion } from '../utils'
+
+  export let value: CardType
+
+  const client = getClient()
+  const hierarchy = client.getHierarchy()
+  const ancestors = hierarchy.getAncestors(value._class)
+  const mixins = hierarchy.findAllMixins(value)
+
+  const targets = new Set([...ancestors, ...mixins])
+  const associations = client.getModel().findAllSync(core.class.Association, {})
+  const relationsA = associations.filter((it) => targets.has(it.classB))
+  const relationsB = associations.filter((it) => targets.has(it.classA))
+
+  let relationsToCopy = new Set<string>([
+    ...relationsA.map((p) => `${p._id}_a`),
+    ...relationsB.map((p) => `${p._id}_b`)
+  ])
+
+  async function create (): Promise<void> {
+    const _id = await createNewVersion(value, relationsToCopy)
+    const loc = getCurrentLocation()
+    loc.path[2] = cardId
+    loc.path[3] = _id
+    navigate(loc)
+  }
+</script>
+
+<Card label={plugin.string.NewVersion} canSave={true} width={'small'} okAction={create} on:close>
+  <div class="flex-col flex-gap-2">
+    <Label label={plugin.string.NewVersionConfirmation} />
+    {#if relationsA.length > 0 || relationsB.length > 0}
+      <div>
+        <Label label={plugin.string.RelationCopyDescr} />
+      </div>
+      <div class="grid">
+        {#each relationsB as assoc}
+          {@const id = `${assoc._id}_b`}
+          <span>{assoc.nameB}</span>
+          <Toggle
+            on={relationsToCopy.has(id)}
+            on:change={(e) => {
+              if (e.detail === true) {
+                relationsToCopy.add(id)
+              } else {
+                relationsToCopy.delete(id)
+              }
+              relationsToCopy = relationsToCopy
+            }}
+          />
+        {/each}
+        {#each relationsA as assoc}
+          {@const id = `${assoc._id}_a`}
+          <span>{assoc.nameA}</span>
+          <Toggle
+            on={relationsToCopy.has(id)}
+            on:change={(e) => {
+              if (e.detail === true) {
+                relationsToCopy.add(id)
+              } else {
+                relationsToCopy.delete(id)
+              }
+              relationsToCopy = relationsToCopy
+            }}
+          />
+        {/each}
+      </div>
+    {/if}
+  </div>
+</Card>
+
+<style lang="scss">
+  .grid {
+    display: grid;
+    grid-template-columns: 3fr 1fr;
+    grid-auto-rows: minmax(1rem, max-content);
+    justify-content: start;
+    width: 100%;
+    align-items: center;
+    row-gap: 0.5rem;
+    column-gap: 1rem;
+    height: min-content;
+  }
+</style>
diff --git a/plugins/card-resources/src/components/settings/RelationsSection.svelte b/plugins/card-resources/src/components/settings/RelationsSection.svelte
@@ -29,9 +29,11 @@
   let associations: Association[] = []
   const client = getClient()
   const hierarchy = client.getHierarchy()
-  $: descendants = new Set(hierarchy.getDescendants(masterTag._id))
-
-  $: filtered = associations.filter((it) => descendants.has(it.classA) || descendants.has(it.classB))
+  $: targets = new Set([
+    ...hierarchy.getAncestors(masterTag._id),
+    ...hierarchy.getDescendants(masterTag._id).filter((p) => hierarchy.isMixin(p))
+  ])
+  $: filtered = associations.filter((it) => targets.has(it.classA) || targets.has(it.classB))
   const query = createQuery()
 
   query.query(core.class.Association, {}, (res) => {
diff --git a/plugins/card-resources/src/plugin.ts b/plugins/card-resources/src/plugin.ts
@@ -132,6 +132,7 @@ export default mergeIds(cardId, card, {
     Versioning: '' as IntlString,
     EnableVersioning: '' as IntlString,
     EnableVersioningConfirm: '' as IntlString,
-    NewVersionConfirmation: '' as IntlString
+    NewVersionConfirmation: '' as IntlString,
+    RelationCopyDescr: '' as IntlString
   }
 })
diff --git a/plugins/card-resources/src/utils.ts b/plugins/card-resources/src/utils.ts
@@ -100,6 +100,7 @@ export async function deleteMasterTag (tag: MasterTag | undefined, onDelete?: ()
 async function cloneCard (
   origin: Card,
   overrideProps: Record<string, any>,
+  relationToCopy: Set<string> | 'all',
   copyIds: boolean = false
 ): Promise<Ref<Card>> {
   const client = getClient()
@@ -149,18 +150,22 @@ async function cloneCard (
   }
 
   for (const rel of relationsA) {
-    await ops.createDoc(core.class.Relation, core.space.Workspace, {
-      docA: targetId,
-      docB: rel.docB,
-      association: rel.association
-    })
+    if (relationToCopy === 'all' || relationToCopy.has(`${rel.association}_b`)) {
+      await ops.createDoc(core.class.Relation, core.space.Workspace, {
+        docA: targetId,
+        docB: rel.docB,
+        association: rel.association
+      })
+    }
   }
   for (const rel of relationsB) {
-    await ops.createDoc(core.class.Relation, core.space.Workspace, {
-      docA: rel.docA,
-      docB: targetId,
-      association: rel.association
-    })
+    if (relationToCopy === 'all' || relationToCopy.has(`${rel.association}_a`)) {
+      await ops.createDoc(core.class.Relation, core.space.Workspace, {
+        docA: rel.docA,
+        docB: targetId,
+        association: rel.association
+      })
+    }
   }
   await ops.commit()
 
@@ -176,9 +181,13 @@ async function cloneCard (
 }
 
 export async function duplicateCard (origin: Card): Promise<void> {
-  const targetId = await cloneCard(origin, {
-    title: `${origin.title} (Copy)`
-  })
+  const targetId = await cloneCard(
+    origin,
+    {
+      title: `${origin.title} (Copy)`
+    },
+    'all'
+  )
 
   const loc = getCurrentLocation()
   loc.path[2] = cardId
@@ -328,13 +337,14 @@ export async function cardFactory (props: Record<string, any> = {}): Promise<Ref
   return await createCard(_class, space, props.data, props.content)
 }
 
-export async function createNewVersion (card: Card): Promise<Ref<Card>> {
+export async function createNewVersion (card: Card, relationsToCopy: Set<string>): Promise<Ref<Card>> {
   return await cloneCard(
     card,
     {
       baseId: card.baseId,
       docCreatedBy: card.docCreatedBy ?? card.createdBy ?? card.modifiedBy
     },
+    relationsToCopy,
     true
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@`
`67`	`67`	`"Versioning": "Verzování",`
`68`	`68`	`"EnableVersioning": "Povolit verzování",`
`69`	`69`	`"EnableVersioningConfirm": "Chcete povolit verzování?",`
`70`		`- "NewVersionConfirmation": "Chcete vytvořit novou verzi?"`
	`70`	`+ "NewVersionConfirmation": "Chcete vytvořit novou verzi?",`
	`71`	`+ "RelationCopyDescr": "Které vztahy chcete zkopírovat?"`
`71`	`72`	`}`
`72`	`73`	`}`