From c19694b476476b97b03cd8a484bee00ce232ca7c Mon Sep 17 00:00:00 2001
From: Artyom Savchenko <armisav@gmail.com>
Date: Sun, 19 Jul 2026 21:29:16 +0700
Subject: [PATCH 1/2] Fix validation error in export service (#10985)

Signed-off-by: Artyom Savchenko <armisav@gmail.com>
---
 services/export/pod-export/src/server.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/export/pod-export/src/server.ts b/services/export/pod-export/src/server.ts
index 4858326876..b0dae8fc4c 100644
--- a/services/export/pod-export/src/server.ts
+++ b/services/export/pod-export/src/server.ts
@@ -270,6 +270,8 @@ function toSafeFormatFileToken (format: ExportFormat): 'json' | 'csv' {
       return 'json'
     case ExportFormat.CSV:
       return 'csv'
+    default:
+      throw new ApiError(400, `Invalid format. Supported formats: ${supportedExportFormats.join(', ')}`)
   }
 }
 

From 4c94335cc11e8919144c7d9df7c4fde02fb2ab62 Mon Sep 17 00:00:00 2001
From: Denis Bykhov <bykhov.denis@gmail.com>
Date: Mon, 20 Jul 2026 09:42:27 +0500
Subject: [PATCH 2/2] Fix relation attribute editor (#10986)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
---
 .../RelContextPresenter.svelte                | 17 ++--
 .../settings/ProcessAttributeEditor.svelte    | 78 +++++++++++++------
 plugins/process-resources/src/exporter.ts     |  2 +-
 3 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/plugins/process-resources/src/components/attributeEditors/RelContextPresenter.svelte b/plugins/process-resources/src/components/attributeEditors/RelContextPresenter.svelte
index ff57025b24..1410789eda 100644
--- a/plugins/process-resources/src/components/attributeEditors/RelContextPresenter.svelte
+++ b/plugins/process-resources/src/components/attributeEditors/RelContextPresenter.svelte
@@ -20,16 +20,19 @@
   export let context: Context
 
   $: relation = context.relations[contextValue.name]
+
   $: attr = contextValue.key !== '_id' && relation?.attributes?.find((p) => p.name === contextValue.key)
 </script>
 
-{#if contextValue.key === '_id'}
-  {relation.name}
-{:else if relation !== undefined && attr}
-  {relation.name}
-  <span class="attr">
-    <Label label={attr.label} />
-  </span>
+{#if relation !== undefined}
+  {#if contextValue.key === '_id'}
+    {relation.name}
+  {:else if attr}
+    {relation.name}
+    <span class="attr">
+      <Label label={attr.label} />
+    </span>
+  {/if}
 {/if}
 
 <style lang="scss">
diff --git a/plugins/process-resources/src/components/settings/ProcessAttributeEditor.svelte b/plugins/process-resources/src/components/settings/ProcessAttributeEditor.svelte
index 7ef5bb0ebf..cbd4a07d54 100644
--- a/plugins/process-resources/src/components/settings/ProcessAttributeEditor.svelte
+++ b/plugins/process-resources/src/components/settings/ProcessAttributeEditor.svelte
@@ -13,9 +13,9 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Class, Doc, Ref } from '@hcengineering/core'
+  import core, { AnyAttribute, Class, Doc, generateId, Ref, RefTo } from '@hcengineering/core'
   import { getAttributeEditor, getAttributePresenterClass, getClient } from '@hcengineering/presentation'
-  import { Process } from '@hcengineering/process'
+  import { Process, SlotModel } from '@hcengineering/process'
   import { AnySvelteComponent } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import { getContext } from '../../utils'
@@ -44,14 +44,44 @@
     dispatch('change', { value, object })
   }
 
+  let attribute: AnyAttribute | undefined
+
   $: value = object[objectKey ?? key]
 
   $: slot = process.requiredSlots?.[key] as any
-  $: attribute = slot
-    ? ({ name: key, label: slot.label, _id: key, type: slot } as any)
-    : hierarchy.getAttribute(_class, key)
-  $: presenterClass = getAttributePresenterClass(hierarchy, attribute.type)
-  $: context = getContext(client, process, presenterClass.attrClass, presenterClass.category, attribute._id, true)
+
+  function getAttr (_class: Ref<Class<Doc>>, key: string, slot: SlotModel | undefined): AnyAttribute | undefined {
+    if (slot !== undefined) return { name: key, label: slot.label, _id: key, type: slot } as any
+    const attr = hierarchy.findAttribute(_class, key)
+    if (attr !== undefined) return attr
+    if (key === '') return mockAttribute(_class)
+    return undefined
+  }
+
+  function mockAttribute (_class: Ref<Class<Doc>>): AnyAttribute {
+    const type: RefTo<Doc> = {
+      label: core.string.Ref,
+      _class: core.class.RefTo,
+      to: _class
+    }
+    return {
+      attributeOf: _class,
+      name: '',
+      type,
+      _id: generateId(),
+      space: core.space.Model,
+      modifiedOn: 0,
+      modifiedBy: core.account.System,
+      _class: core.class.Attribute,
+      label: core.string.Object
+    }
+  }
+  $: attribute = getAttr(_class, key, slot)
+  $: presenterClass = attribute && getAttributePresenterClass(hierarchy, attribute.type)
+  $: context =
+    attribute &&
+    presenterClass &&
+    getContext(client, process, presenterClass.attrClass, presenterClass.category, attribute._id, true)
 
   let editor: AnySvelteComponent | undefined
 
@@ -64,19 +94,21 @@
   $: getBaseEditor(_class, key)
 </script>
 
-<ProcessAttribute
-  {process}
-  {context}
-  {editor}
-  {attribute}
-  {presenterClass}
-  {value}
-  masterTag={process.masterTag}
-  {allowRemove}
-  {allowArray}
-  {forbidValue}
-  on:remove
-  on:change={(e) => {
-    onChange(e.detail)
-  }}
-/>
+{#if attribute && presenterClass && context}
+  <ProcessAttribute
+    {process}
+    {context}
+    {editor}
+    {attribute}
+    {presenterClass}
+    {value}
+    masterTag={process.masterTag}
+    {allowRemove}
+    {allowArray}
+    {forbidValue}
+    on:remove
+    on:change={(e) => {
+      onChange(e.detail)
+    }}
+  />
+{/if}
diff --git a/plugins/process-resources/src/exporter.ts b/plugins/process-resources/src/exporter.ts
index ea45d7a447..2cce2783f8 100644
--- a/plugins/process-resources/src/exporter.ts
+++ b/plugins/process-resources/src/exporter.ts
@@ -276,7 +276,7 @@ export function exportProcess (proc: Process, withSlots: boolean = true): Export
     if (docIndex !== -1) docs[docIndex] = restProc
   }
 
-  return { docs: normalizeIds(docs), required }
+  return { docs: withSlots ? normalizeIds(docs) : docs, required }
 }
 
 // ─── Import API ──────────────────────────────────────────────────────────────