@lobb-js/studio 0.19.1 → 0.20.0

package/dist/components/polymorphicInput.svelte

@@ -0,0 +1,141 @@
+<script lang="ts">
+    import Button from "./ui/button/button.svelte";
+    import DataTable from "./dataTable/dataTable.svelte";
+    import Drawer from "./drawer.svelte";
+    import * as Popover from "./ui/popover/index";
+    import { getCollectionPrimaryField } from "./dataTable/utils";
+    import { getStudioContext } from "../context";
+    import { ArrowLeft, Link, ChevronDown } from "lucide-svelte";
+
+    const { ctx } = getStudioContext();
+
+    interface Props {
+        collectionField: string;
+        idField: string;
+        targetCollections: string[];
+        entry: Record<string, any>;
+        destructive?: boolean;
+    }
+
+    let {
+        collectionField,
+        idField,
+        targetCollections,
+        entry = $bindable(),
+        destructive,
+    }: Props = $props();
+
+    const selectedCollection = $derived(entry[collectionField] ?? null);
+    const selectedId = $derived(entry[idField]?.id ?? entry[idField] ?? null);
+    const primaryField = $derived(entry[idField] ? Object.values(entry[idField])[1] : null);
+
+    let collectionPopoverOpen = $state(false);
+    let recordDrawerOpen = $state(false);
+
+    function onCollectionChange(col: string) {
+        collectionPopoverOpen = false;
+        if (entry[collectionField] !== col) {
+            entry = { ...entry, [collectionField]: col, [idField]: null };
+        }
+    }
+
+    function onIdChange(e: Event) {
+        const raw = (e.target as HTMLInputElement).value;
+        const id = raw === "" ? null : Number(raw);
+        entry = { ...entry, [idField]: id === null ? null : { id } };
+    }
+
+    function onRecordSelect(record: any) {
+        const primaryFieldName = getCollectionPrimaryField(ctx, selectedCollection!);
+        const value: any = { id: record.id };
+        if (primaryFieldName) value[primaryFieldName] = record[primaryFieldName];
+        entry = { ...entry, [idField]: value };
+        recordDrawerOpen = false;
+    }
+</script>
+
+<div class="flex h-9 w-full items-center gap-1.5 rounded-md border pl-1.5 pr-9 text-xs bg-muted/30 {destructive ? 'border-destructive bg-destructive/10' : ''}">
+    <!-- Collection picker -->
+    <Popover.Root bind:open={collectionPopoverOpen}>
+        <Popover.Trigger>
+            {#snippet child({ props })}
+                <button
+                    {...props}
+                    class="flex shrink-0 items-center gap-1 h-6 px-2 rounded-sm border bg-muted text-xs text-muted-foreground hover:bg-accent hover:text-foreground transition-colors"
+                >
+                    {selectedCollection ?? "NULL"}
+                    <ChevronDown size="11" />
+                </button>
+            {/snippet}
+        </Popover.Trigger>
+        <Popover.Content class="w-48 p-2">
+            <div class="flex flex-col gap-1">
+                {#each targetCollections as col}
+                    <Button
+                        variant={selectedCollection === col ? "default" : "ghost"}
+                        class="justify-start text-xs font-normal h-7 px-2"
+                        onclick={() => onCollectionChange(col)}
+                    >
+                        {col}
+                    </Button>
+                {/each}
+            </div>
+        </Popover.Content>
+    </Popover.Root>
+
+    <!-- Transparent id input -->
+    <input
+        placeholder="NULL"
+        type="number"
+        class="min-w-0 flex-1 bg-transparent outline-none text-xs placeholder:text-muted-foreground"
+        value={selectedId ?? ""}
+        oninput={onIdChange}
+    />
+
+    <!-- Primary field badge -->
+    {#if primaryField}
+        <div class="flex shrink-0 items-center bg-background rounded-full border h-6 px-3 shadow-sm">
+            {primaryField}
+        </div>
+    {/if}
+
+    <!-- Select record button -->
+    {#if selectedCollection}
+        <Button
+            class="h-6 shrink-0 px-2 font-normal text-xs"
+            variant="outline"
+            onclick={() => (recordDrawerOpen = true)}
+        >
+            <Link size="13" />
+            Select Record
+        </Button>
+    {/if}
+</div>
+
+{#if recordDrawerOpen}
+    <Drawer onHide={async () => { recordDrawerOpen = false }}>
+        <div class="flex h-12 items-center gap-4 border-b px-4">
+            <Button
+                variant="outline"
+                onclick={() => (recordDrawerOpen = false)}
+                class="h-8 w-8 rounded-full text-xs font-normal"
+                Icon={ArrowLeft}
+            />
+            <div class="flex items-center gap-2">
+                <div class="text-sm">Select record from</div>
+                <span class="rounded-md border bg-muted px-2 py-0.5 text-sm">
+                    {selectedCollection}
+                </span>
+            </div>
+        </div>
+        <div class="flex-1 overflow-y-auto bg-muted">
+            <DataTable
+                collectionName={selectedCollection!}
+                tableProps={{
+                    showCheckboxes: false,
+                    select: { onSelect: onRecordSelect },
+                }}
+            />
+        </div>
+    </Drawer>
+{/if}

package/dist/components/polymorphicInput.svelte.d.ts

@@ -0,0 +1,10 @@
+interface Props {
+    collectionField: string;
+    idField: string;
+    targetCollections: string[];
+    entry: Record<string, any>;
+    destructive?: boolean;
+}
+declare const PolymorphicInput: import("svelte").Component<Props, {}, "entry">;
+type PolymorphicInput = ReturnType<typeof PolymorphicInput>;
+export default PolymorphicInput;

package/dist/relations.d.ts

@@ -0,0 +1,14 @@
+import type { CTX } from "./store.types";
+export declare function isRelationField(ctx: CTX, collectionName: string, fieldName: string): boolean;
+export declare function getFieldRelationTarget(ctx: CTX, collectionName: string, fieldName: string): string | null;
+export declare function getPolymorphicRelation(ctx: CTX, collectionName: string, fieldName: string): {
+    type: "polymorphic";
+    from: {
+        collection: string;
+        virtual_field: string;
+        collection_field: string;
+        id_field: string;
+    };
+    to: string[];
+};
+export declare function recordHasChildrean(ctx: CTX, collectionName: string): boolean;

package/dist/relations.js

@@ -0,0 +1,47 @@
+function getFieldRelation(ctx, collectionName, fieldName) {
+    var relations = ctx.meta.relations;
+    for (var index = 0; index < relations.length; index++) {
+        var relation = relations[index];
+        if (relation.type === "polymorphic")
+            continue;
+        if (relation.from.collection === collectionName && relation.from.field === fieldName) {
+            return relation;
+        }
+    }
+    return null;
+}
+;
+export function isRelationField(ctx, collectionName, fieldName) {
+    return Boolean(getFieldRelation(ctx, collectionName, fieldName));
+}
+;
+export function getFieldRelationTarget(ctx, collectionName, fieldName) {
+    var _a, _b;
+    return (_b = (_a = getFieldRelation(ctx, collectionName, fieldName)) === null || _a === void 0 ? void 0 : _a.to.collection) !== null && _b !== void 0 ? _b : null;
+}
+;
+export function getPolymorphicRelation(ctx, collectionName, fieldName) {
+    var relations = ctx.meta.relations;
+    for (var index = 0; index < relations.length; index++) {
+        var relation = relations[index];
+        if (relation.type === "polymorphic" &&
+            relation.from.collection === collectionName &&
+            relation.from.virtual_field === fieldName) {
+            return relation;
+        }
+    }
+    return null;
+}
+;
+export function recordHasChildrean(ctx, collectionName) {
+    for (var index = 0; index < ctx.meta.relations.length; index++) {
+        var relation = ctx.meta.relations[index];
+        if (relation.type === "polymorphic")
+            continue;
+        if (relation.to.collection === collectionName) {
+            return true;
+        }
+    }
+    return false;
+}
+;

package/dist/store.types.d.ts

@@ -12,6 +12,7 @@ interface Collection {
     singleton: boolean;
     virtual?: boolean;
     ui?: {
+        icon?: string;
         tabs?: CollectionTab[];
     };
 }

package/dist/utils.d.ts

@@ -1,6 +1,5 @@
 import { type ClassValue } from "clsx";
 import { MediaQuery } from 'svelte/reactivity';
-import type { CTX } from "./store.types";
 export declare function cn(...inputs: ClassValue[]): string;
 export type WithoutChild<T> = T extends {
     child?: any;
@@ -19,8 +18,6 @@ export declare const mediaQueries: {
     xl: MediaQuery;
     '2xl': MediaQuery;
 };
-export declare function getFieldRelation(ctx: CTX, collectionName: string, fieldName: string): any;
-export declare function recordHasChildrean(ctx: CTX, collectionName: string): boolean;
 export declare function calculateDrawerWidth(): number;
 export declare function getChangedProperties(oldObj: Record<string, any>, newObj: Record<string, any>): Record<string, any>;
 export declare function parseFunction(functionString: string): any;

package/dist/utils.js

@@ -15,27 +15,6 @@ export var mediaQueries = {
     xl: new MediaQuery('min-width: 1280px'),
     '2xl': new MediaQuery('min-width: 1536px'),
 };
-export function getFieldRelation(ctx, collectionName, fieldName) {
-    var relations = ctx.meta.relations;
-    for (var index = 0; index < relations.length; index++) {
-        var relation = relations[index];
-        if (relation.from.collection === collectionName && relation.from.field === fieldName) {
-            return relation;
-        }
-    }
-    return null;
-}
-;
-export function recordHasChildrean(ctx, collectionName) {
-    for (var index = 0; index < ctx.meta.relations.length; index++) {
-        var relation = ctx.meta.relations[index];
-        if (relation.to.collection === collectionName) {
-            return true;
-        }
-    }
-    return false;
-}
-;
 export function calculateDrawerWidth() {
     var backgroundDrawerButtons = document.querySelectorAll(".backgroundDrawerButton");
     var drawersCount = Array.from(backgroundDrawerButtons).length;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lobb-js/studio",
   "license": "UNLICENSED",
-  "version": "0.19.1",
+  "version": "0.20.0",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -42,7 +42,7 @@
     "postpublish": "./scripts/postpublish.sh"
   },
   "devDependencies": {
-    "@lobb-js/core": "^0.23.0",
+    "@lobb-js/core": "^0.24.0",
     "@chromatic-com/storybook": "^4.1.2",
     "@storybook/addon-a11y": "^10.0.1",
     "@storybook/addon-docs": "^10.0.1",

package/src/lib/components/dataTable/fieldCell.svelte

@@ -1,10 +1,10 @@
 <script lang="ts">
-    import { getFieldRelation } from "../../utils";
+    import { getFieldRelationTarget, getPolymorphicRelation, isRelationField } from "../../relations";
     import { ExternalLink } from "lucide-svelte";
     import UpdateDetailViewButton from "../detailView/update/updateDetailViewButton.svelte";
     import { getField } from "./utils";
     import EnumBadge from "./enumBadge.svelte";
-    import _ from "lodash";
+    import PolymorphicFieldCell from "./polymorphicFieldCell.svelte";
     import { getStudioContext } from "../../context";
 
     const { ctx } = getStudioContext();
@@ -26,49 +26,50 @@
     }: Props = $props();
 
     const field = getField(ctx, fieldName, collectionName);
-    const relation = getFieldRelation(ctx, collectionName, fieldName);
-    const isRefrenceField = Boolean(
-        getFieldRelation(ctx, collectionName, fieldName),
-    );
+    const relationTarget = getFieldRelationTarget(ctx, collectionName, fieldName);
+    const polymorphicRelation = getPolymorphicRelation(ctx, collectionName, fieldName);
+    const isRefrenceField = isRelationField(ctx, collectionName, fieldName);
     const isPasswordField = ctx.meta.collections[collectionName].fields[fieldName]?.ui?.input?.type === "password";
 </script>
 
-{#if isPasswordField}
+{#if polymorphicRelation}
+    <PolymorphicFieldCell
+        collectionField={polymorphicRelation.from.collection_field}
+        idField={polymorphicRelation.from.id_field}
+        {entry}
+        bind:tableParams
+    />
+{:else if isRefrenceField}
+    {#if value?.id && value.id !== 0}
+        <div class="flex items-center gap-2">
+            <div>{value.id}</div>
+            {#if Object.values(value)[1]}
+                <div class="border bg-muted px-3 py-1 rounded-full">
+                    {Object.values(value)[1]}
+                </div>
+            {/if}
+            <UpdateDetailViewButton
+                collectionName={relationTarget!}
+                recordId={value.id}
+                variant="ghost"
+                class="h-5 w-5 px-0 py-0 text-muted-foreground hover:bg-transparent"
+                Icon={ExternalLink}
+                onSuccessfullSave={async () => {
+                    tableParams = { ...tableParams };
+                }}
+            />
+        </div>
+    {:else if value?.id === 0}
+        <div class="text-muted-foreground">PARENT ID</div>
+    {:else}
+        <div class="text-muted-foreground">NULL</div>
+    {/if}
+{:else if isPasswordField}
     <div class="text-muted-foreground tracking-widest">••••••</div>
 {:else if value === ""}
     <div class="text-muted-foreground">EMPTY STRING</div>
 {:else if value === null || value === undefined}
     <div class="text-muted-foreground">NULL</div>
-{:else if isRefrenceField}
-    {#if typeof value !== "object"}
-        <div>{value}</div>
-    {:else if value.id !== 0}
-        {@const primaryField = Object.values(value)[1]}
-        {#if value.id}
-            <div class="flex items-center gap-2">
-                <div>{value.id}</div>
-                {#if primaryField}
-                    <div class="border bg-muted px-3 py-1 rounded-full">
-                        {primaryField}
-                    </div>
-                {/if}
-                <UpdateDetailViewButton
-                    collectionName={relation.to.collection}
-                    recordId={value.id}
-                    variant="ghost"
-                    class="h-5 w-5 px-0 py-0 text-muted-foreground hover:bg-transparent"
-                    Icon={ExternalLink}
-                    onSuccessfullSave={async () => {
-                        tableParams = { ...tableParams };
-                    }}
-                ></UpdateDetailViewButton>
-            </div>
-        {:else}
-            <div class="text-muted-foreground">NULL</div>
-        {/if}
-    {:else}
-        <div class="text-muted-foreground">PARENT ID</div>
-    {/if}
 {:else if field?.enum}
     <EnumBadge {value} enum={field.enum} />
 {:else if field.type === "datetime"}

package/src/lib/components/dataTable/polymorphicFieldCell.svelte

@@ -0,0 +1,43 @@
+<script lang="ts">
+    import { ExternalLink, Table } from "lucide-svelte";
+    import UpdateDetailViewButton from "../detailView/update/updateDetailViewButton.svelte";
+
+    interface Props {
+        collectionField: string;
+        idField: string;
+        entry: Record<string, any>;
+        tableParams?: any;
+    }
+
+    let {
+        collectionField,
+        idField,
+        entry,
+        tableParams = $bindable(),
+    }: Props = $props();
+
+    const targetCollection = $derived(entry[collectionField] ?? null);
+    const targetId = $derived(entry[idField] ?? null);
+</script>
+
+{#if targetId && targetCollection}
+    <div class="flex items-center gap-2">
+        <div class="flex items-center gap-1 border bg-muted px-2 py-1 rounded-md text-muted-foreground">
+            <Table size="11" />
+            {targetCollection}
+        </div>
+        <div>{targetId}</div>
+        <UpdateDetailViewButton
+            collectionName={targetCollection}
+            recordId={targetId}
+            variant="ghost"
+            class="h-5 w-5 px-0 py-0 text-muted-foreground hover:bg-transparent"
+            Icon={ExternalLink}
+            onSuccessfullSave={async () => {
+                tableParams = { ...tableParams };
+            }}
+        />
+    </div>
+{:else}
+    <div class="text-muted-foreground">NULL</div>
+{/if}

package/src/lib/components/dataTable/utils.ts

@@ -1,5 +1,6 @@
 import type { TableProps } from "./table.svelte";
 import type { CTX } from "../../store.types";
+import { getFieldRelationTarget } from "../../relations";
 
 import {
     Binary,
@@ -10,15 +11,18 @@ import {
     Clock,
     Hash,
     Key,
+    Link,
     Text,
     Type,
 } from "lucide-svelte/icons";
+import { icons } from "lucide-svelte";
 
 export function getCollectionColumns(ctx: CTX, collectionName: string): TableProps['columns'] {
     const collectionFields = getFields(ctx, collectionName);
     const headers: TableProps['columns'] = [];
     for (const fieldName in collectionFields) {
         const field = collectionFields[fieldName];
+        if ((field as any).ui?.hidden) continue;
         headers.push({
             id: field.key,
             subtext: field.type,
@@ -30,6 +34,8 @@ export function getCollectionColumns(ctx: CTX, collectionName: string): TablePro
 
 export function getFieldIcon(ctx: CTX, fieldName: string, collectionName: string) {
 	const field = getField(ctx, fieldName, collectionName);
+	const uiIcon = (field as any).ui?.icon;
+	if (uiIcon && uiIcon in icons) return (icons as any)[uiIcon];
 	if (fieldName === "id") {
 		return Key;
 	} else if (field.type === "string") {
@@ -43,6 +49,12 @@ export function getFieldIcon(ctx: CTX, fieldName: string, collectionName: string
 	} else if (field.type === "bool") {
 		return Binary;
 	} else if (field.type === "integer") {
+		const target = getFieldRelationTarget(ctx, collectionName, fieldName);
+		if (target) {
+			const targetIcon = ctx.meta.collections[target]?.ui?.icon;
+			if (targetIcon && targetIcon in icons) return (icons as any)[targetIcon];
+			return Link;
+		}
 		return Hash;
 	} else if (field.type === "long") {
 		return Hash;
@@ -58,7 +70,7 @@ export function getFieldIcon(ctx: CTX, fieldName: string, collectionName: string
 		return Clock;
 	}
 
-	throw new Error(`(${field.type}) doesnt have an icon`);
+	return Braces;
 }
 
 export function getFields(ctx: CTX, collectionName: string) {
@@ -91,7 +103,7 @@ export function getCollectionParamsFields(ctx: CTX, collectionName: string, allF
 	const relations = ctx.meta.relations;
 	const foreignFields = relations
 		.filter((relation) => {
-			return relation.from.collection === collectionName
+			return relation.type !== "polymorphic" && relation.from.collection === collectionName;
 		})
 		.map((relation) => {
 			return {

package/src/lib/components/detailView/create/createDetailView.svelte

@@ -161,46 +161,38 @@
     <div class="flex-1 overflow-y-auto">
         <div class="flex flex-col gap-4 p-4">
             {#each fieldNames as fieldName}
-                {@const field = getField(ctx, fieldName, collectionName)}
-                {@const FieldIcon = getFieldIcon(ctx, fieldName, collectionName)}
-                <div
-                    class="flex flex-col gap-2"
-                >
-                    <div
-                        class="flex flex-1 items-end justify-between gap-2 text-xs"
-                    >
-                        <div class="flex gap-2">
-                            <div class="h-fit">{field.label}</div>
-                            <div
-                                class="flex h-fit items-center gap-1 text-[0.7rem] text-muted-foreground"
-                            >
-                                <FieldIcon size="12" />
-                                {field.type}
+                {#if !ctx.meta.collections[collectionName].fields[fieldName]?.ui?.hidden}
+                    {@const field = getField(ctx, fieldName, collectionName)}
+                    {@const FieldIcon = getFieldIcon(ctx, fieldName, collectionName)}
+                    <div class="flex flex-col gap-2">
+                        <div class="flex flex-1 items-end justify-between gap-2 text-xs">
+                            <div class="flex gap-2">
+                                <div class="h-fit">{field.label}</div>
+                                <div class="flex h-fit items-center gap-1 text-[0.7rem] text-muted-foreground">
+                                    <FieldIcon size="12" />
+                                    {field.type}
+                                </div>
+                            </div>
+                            <div>
+                                <ExtensionsComponents
+                                    name="dvFields.topRight.{collectionName}.{fieldName}"
+                                    utils={getExtensionUtils(lobb, ctx)}
+                                    bind:value={entry[fieldName]}
+                                />
                             </div>
                         </div>
-                        <div>
-                            <ExtensionsComponents
-                                name="dvFields.topRight.{collectionName}.{fieldName}"
-                                utils={getExtensionUtils(lobb, ctx)}
-                                bind:value={entry[fieldName]}
-                            />
-                        </div>
+                        <FieldInput
+                            {collectionName}
+                            {fieldName}
+                            bind:value={
+                                () => entry[fieldName],
+                                (v) => (entry = { ...entry, [fieldName]: v })
+                            }
+                            bind:entry
+                            errorMessages={fieldsErrors[fieldName]}
+                        />
                     </div>
-                    <FieldInput
-                        {collectionName}
-                        {fieldName}
-                        bind:value={
-                            () => entry[fieldName],
-                            (v) =>
-                                (entry = {
-                                    ...entry,
-                                    [fieldName]: v,
-                                })
-                        }
-                        {entry}
-                        errorMessages={fieldsErrors[fieldName]}
-                    />
-                </div>
+                {/if}
             {/each}
         </div>
         {#if showRelatedRecords}

package/src/lib/components/detailView/fieldInput.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { getStudioContext } from "../../context";
-	import { getFieldRelation } from "../../utils";
+	import { getFieldRelationTarget, getPolymorphicRelation } from "../../relations";
 	import { Ban, Check, CircleAlert, X } from "lucide-svelte";
 	import { getField } from "../dataTable/utils";
 	import Button from "../ui/button/button.svelte";
@@ -11,6 +11,7 @@
 	import type { EnumOption } from "@lobb-js/core";
 	import Textarea from "../ui/textarea/textarea.svelte";
 	import ForeingKeyInput from "../foreingKeyInput.svelte";
+	import PolymorphicInput from "../polymorphicInput.svelte";
     import ExtensionsComponents from "../extensionsComponents.svelte";
     import { getExtensionUtils } from "../../extensions/extensionUtils";
 
@@ -29,7 +30,7 @@
 		fieldName,
 		value = $bindable(),
 		errorMessages = [],
-		entry,
+		entry = $bindable(),
 	}: Props = $props();
 
 	const ui_input =
@@ -37,10 +38,11 @@
 	const ui =
 		ctx.meta.collections[collectionName].fields[fieldName].ui;
 	const field = getField(ctx, fieldName, collectionName);
-	const fieldRelation = getFieldRelation(ctx, collectionName, fieldName);
+	const fieldRelationTarget = getFieldRelationTarget(ctx, collectionName, fieldName);
+	const polymorphicRelation = getPolymorphicRelation(ctx, collectionName, fieldName);
 	const isDisabled = field.key === 'id' || Boolean(ui?.disabled)
 	const disabledClasses = "pointer-events-none opacity-50";
-	const destructive: boolean = $derived(Boolean(errorMessages.length));
+	const destructive: boolean = $derived(!isDisabled && Boolean(errorMessages.length));
 
 </script>
 
@@ -53,13 +55,27 @@
 		style="flex: 2;"
 	>
 		<Button
-			onclick={() => (value = null)}
+			onclick={() => {
+				value = null;
+				if (polymorphicRelation && entry) {
+					entry[polymorphicRelation.from.collection_field] = null;
+					entry[polymorphicRelation.from.id_field] = null;
+				}
+			}}
 			variant="outline"
 			class="absolute right-0 top-0 z-10 mr-1.5 mt-1.5 aspect-square h-6 w-6 p-0"
 			Icon={Ban}
 			tabindex={-1}
 		></Button>
-		{#if ui_input}
+		{#if polymorphicRelation && entry}
+			<PolymorphicInput
+				collectionField={polymorphicRelation.from.collection_field}
+				idField={polymorphicRelation.from.id_field}
+				targetCollections={polymorphicRelation.to}
+				bind:entry
+				{destructive}
+			/>
+		{:else if ui_input}
 			<FieldCustomInput
 				bind:value
 				type={ui_input.type}
@@ -73,12 +89,12 @@
 				class="bg-muted/30 text-xs"
 				bind:value
 			/>
-		{:else if fieldRelation && entry}
+		{:else if fieldRelationTarget && entry}
 			<ExtensionsComponents
-				name="detailView.fields.foreignKey.{fieldRelation.to.collection}"
+				name="detailView.fields.foreignKey.{fieldRelationTarget}"
 				utils={getExtensionUtils(lobb, ctx)}
 				parentCollectionName={collectionName}
-				collectionName={fieldRelation.to.collection}
+				collectionName={fieldRelationTarget}
 				bind:value
 				{entry}
 				fieldName={field.key}
@@ -86,7 +102,7 @@
 			>
 				<ForeingKeyInput
 					parentCollectionName={collectionName}
-					collectionName={fieldRelation.to.collection}
+					collectionName={fieldRelationTarget}
 					bind:value
 					{entry}
 					fieldName={field.key}
@@ -263,7 +279,7 @@
 				bind:value
 			/>
 		{/if}
-		{#if errorMessages}
+		{#if !isDisabled && errorMessages}
 			{#each errorMessages as message}
 				<div class="flex gap-1 text-destructive">
 					<CircleAlert size="15" class="translate-y-[0.025rem]" />