@lobb-js/studio 0.27.0 → 0.27.1

package/dist/components/dataTable/listViewChildren.svelte

@@ -64,7 +64,7 @@
                                 variant="ghost"
                                 class="h-7 px-3 text-xs font-normal"
                                 Icon={Plus}
-                                values={{ [child.field]: { id: recordId } }}
+                                values={{ [child.field]: recordId }}
                                 onSuccessfullSave={async () => { refreshDataTable = !refreshDataTable; }}
                             >
                                 Create

package/dist/components/detailView/create/createDetailView.svelte

@@ -30,8 +30,6 @@
     import {
         buildChildren,
         getDefaultEntry,
-        parseDetailViewValues,
-        serializeEntry,
     } from "../utils";
     import { getChangedProperties } from "../../../utils";
     import type { Snippet } from "svelte";
@@ -50,8 +48,6 @@
         submitButton,
     }: CreateDetailViewProp = $props();
 
-    parseDetailViewValues(ctx, collectionName, values)
-
     const fieldNames = Object.keys(ctx.meta.collections[collectionName].fields);
     let entry: Record<string, any> = $state(
         getDefaultEntry(ctx, fieldNames, collectionName, values),
@@ -88,9 +84,8 @@
             return;
         }
 
-        const serializedEntry = serializeEntry(ctx, collectionName, localEntry);
         const children = buildChildren(ctx, collectionName, localEntry);
-        const response = await lobb.createOne(collectionName, serializedEntry, children);
+        const response = await lobb.createOne(collectionName, localEntry, children);
 
         await emitEvent({ lobb, ctx }, "studio.collections.create", {
             collectionName,

package/dist/components/detailView/update/updateDetailView.svelte

@@ -31,7 +31,7 @@
     import { getField, getFieldIcon } from "../../dataTable/utils";
     import DetailViewChildren from "../update/detailViewChildren.svelte";
     import type { Snippet } from "svelte";
-    import { getDefaultEntry, parseDetailViewValues, serializeEntry } from "../utils";
+    import { getDefaultEntry } from "../utils";
     import FieldInput from "../fieldInput.svelte";
   import Drawer from "../../../components/drawer.svelte";
 
@@ -46,8 +46,6 @@
         recordId,
     }: UpdateDetailViewProp = $props();
 
-    parseDetailViewValues(ctx, collectionName, values)
-
     const fieldNames = Object.keys(ctx.meta.collections[collectionName].fields);
     let entry: Record<string, any> = $state(
         getDefaultEntry(ctx, fieldNames, collectionName, values),
@@ -61,7 +59,6 @@
 
     async function handleSave() {
         delete localEntry.id;
-        localEntry = serializeEntry(ctx, collectionName, localEntry);
 
         const children = Object.keys(pendingChildren).length ? pendingChildren : undefined;
         const response = await lobb.updateOne(

package/dist/components/detailView/update/updateDetailViewButton.svelte

@@ -4,7 +4,6 @@
 	import Button from "../../../components/ui/button/button.svelte";
 	import UpdateDetailView from "./updateDetailView.svelte";
 	import { getStudioContext } from "../../../context";
-	import { getCollectionParamsFields } from "../../dataTable/utils";
 
 	interface LocalProp extends UpdateDetailViewProp {
 		variant?: ButtonProps["variant"];
@@ -17,11 +16,11 @@
 	let open = $state(false);
 	let values: Record<string, any> | undefined = $state(undefined);
 
-	const { lobb, ctx } = getStudioContext();
+	const { lobb } = getStudioContext();
 
 	async function openView() {
 		const params = {
-			fields: getCollectionParamsFields(ctx, props.collectionName, true),
+			fields: "*",
 			filter: { id: props.recordId },
 			limit: 1,
 		};

package/dist/components/detailView/utils.d.ts

@@ -3,10 +3,8 @@ import type { DetailFormField } from "./detailViewForm.svelte";
 export declare function getDefaultEntry(ctx: CTX, fieldNames: string[], collectionName: string, values?: Record<string, any>): {
     [k: string]: any;
 };
-export declare function serializeEntry(ctx: CTX, collectionName: string, entry: Record<string, any>): Record<string, any>;
 export declare function buildChildren(ctx: CTX, collectionName: string, entry: Record<string, any>): Record<string, {
     create?: any[];
     link?: any[];
 }> | undefined;
-export declare function parseDetailViewValues(ctx: CTX, collectionName: string, values: Record<string, any>): void;
 export declare function getCollectionFields(ctx: CTX, collectionName: string): DetailFormField[];

package/dist/components/detailView/utils.js

@@ -1,16 +1,4 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 import Mustache from "mustache";
-import { isRelationField } from "../../relations";
 import { getField } from "../dataTable/utils";
 export function getDefaultEntry(ctx, fieldNames, collectionName, values) {
     return Object.fromEntries(fieldNames.map(function (fieldName) {
@@ -33,42 +21,17 @@ export function getDefaultEntry(ctx, fieldNames, collectionName, values) {
         return [fieldName, value];
     }));
 }
-export function serializeEntry(ctx, collectionName, entry) {
-    entry = __assign({}, entry);
-    // extract FK object fields → ID
-    for (var _i = 0, _a = Object.entries(entry); _i < _a.length; _i++) {
-        var _b = _a[_i], fieldName = _b[0], fieldValue = _b[1];
-        var isRefrenceField = isRelationField(ctx, collectionName, fieldName);
-        if (isRefrenceField && fieldValue !== null && fieldValue.id !== undefined) {
-            entry[fieldName] = fieldValue.id;
-        }
-    }
-    // extract polymorphic id_field objects → ID
-    for (var _c = 0, _d = ctx.meta.relations; _c < _d.length; _c++) {
-        var relation = _d[_c];
-        if (relation.type !== "polymorphic")
-            continue;
-        if (relation.from.collection !== collectionName)
-            continue;
-        var idField = relation.from.id_field;
-        var fieldValue = entry[idField];
-        if (fieldValue !== null && typeof fieldValue === "object" && fieldValue.id !== undefined) {
-            entry[idField] = fieldValue.id;
-        }
-    }
-    return entry;
-}
 export function buildChildren(ctx, collectionName, entry) {
     var childrenRelations = ctx.meta.relations.filter(function (relation) { return relation.type !== "polymorphic" && relation.to.collection === collectionName; });
     var children = {};
-    var _loop_1 = function (relation) {
+    for (var _i = 0, childrenRelations_1 = childrenRelations; _i < childrenRelations_1.length; _i++) {
+        var relation = childrenRelations_1[_i];
         var childCollection = relation.from.collection;
         var childEntries = entry[childCollection];
         if (!(childEntries === null || childEntries === void 0 ? void 0 : childEntries.length))
-            return "continue";
+            continue;
         var toCreate = childEntries
-            .filter(function (e) { return !e.id; })
-            .map(function (e) { return serializeEntry(ctx, childCollection, e); });
+            .filter(function (e) { return !e.id; });
         var toLink = childEntries
             .filter(function (e) { return e.id; })
             .map(function (e) { return e.id; });
@@ -79,54 +42,15 @@ export function buildChildren(ctx, collectionName, entry) {
             if (toLink.length)
                 children[childCollection].link = toLink;
         }
-    };
-    for (var _i = 0, childrenRelations_1 = childrenRelations; _i < childrenRelations_1.length; _i++) {
-        var relation = childrenRelations_1[_i];
-        _loop_1(relation);
     }
     return Object.keys(children).length ? children : undefined;
 }
-export function parseDetailViewValues(ctx, collectionName, values) {
-    var forignFieldNames = ctx.meta.relations
-        .filter(function (relation) { return relation.type !== "polymorphic" && relation.from.collection === collectionName; })
-        .map(function (relation) { return relation.from.field; });
-    var childCollectionNames = ctx.meta.relations
-        .filter(function (relation) { return relation.to.collection === collectionName; })
-        .map(function (relation) { return relation.from.collection; });
-    for (var _i = 0, _a = Object.entries(values); _i < _a.length; _i++) {
-        var _b = _a[_i], key = _b[0], value = _b[1];
-        if (forignFieldNames.includes(key)) {
-            if (typeof value === 'number') {
-                values[key] = {
-                    id: value,
-                };
-            }
-        }
-        else if (childCollectionNames.includes(key)) {
-            for (var index = 0; index < values[key].length; index++) {
-                parseDetailViewValues(ctx, key, values[key][index]);
-            }
-        }
-    }
-    // wrap polymorphic id_field scalar values into { id: value }
-    for (var _c = 0, _d = ctx.meta.relations; _c < _d.length; _c++) {
-        var relation = _d[_c];
-        if (relation.type !== "polymorphic")
-            continue;
-        if (relation.from.collection !== collectionName)
-            continue;
-        var idField = relation.from.id_field;
-        if (idField in values && typeof values[idField] === 'number') {
-            values[idField] = { id: values[idField] };
-        }
-    }
-}
 export function getCollectionFields(ctx, collectionName) {
     var returnedData = [];
     var collectionFields = ctx.meta.collections[collectionName].fields;
     var isSingleton = ctx.meta.collections[collectionName].singleton;
     for (var _i = 0, _a = Object.entries(collectionFields); _i < _a.length; _i++) {
-        var _b = _a[_i], fieldName = _b[0], value = _b[1];
+        var fieldName = _a[_i][0];
         if (isSingleton && fieldName === "id") {
             continue;
         }

package/dist/components/foreingKeyInput.svelte

@@ -1,14 +1,19 @@
 <script lang="ts">
+    import { onMount } from "svelte";
     import Input from "./ui/input/input.svelte";
     import SelectRecord from "./selectRecord.svelte";
     import UpdateDetailViewButton from "./detailView/update/updateDetailViewButton.svelte";
+    import { getCollectionPrimaryField } from "./dataTable/utils";
+    import { getStudioContext } from "../context";
     import { ExternalLink } from "lucide-svelte";
 
+    const { lobb, ctx } = getStudioContext();
+
     interface LocalProps {
         parentCollectionName: string;
         collectionName: string;
         fieldName: string;
-        value?: any;
+        value?: number | null;
         destructive?: boolean;
         entry: Record<string, any>;
     }
@@ -22,31 +27,48 @@
         entry,
     }: LocalProps = $props();
 
-    const idIsZero = $derived(value?.id === 0);
-    const refrenceId = $derived(value ? value.id : null);
-    const primaryField = $derived(value ? Object.values(value)[1] : null);
+    let displayName = $state<string | null>(null);
+
+    onMount(async () => {
+        if (value == null) return;
+        try {
+            const res = await lobb.findOne(collectionName, value);
+            const record = (await res.json()).data;
+            const primaryFieldName = getCollectionPrimaryField(ctx, collectionName);
+            displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
+        } catch {
+            displayName = null;
+        }
+    });
+
+    $effect(() => {
+        if (value == null) displayName = null;
+    });
+
+    function handleSelect(selectedEntry: any) {
+        const primaryFieldName = getCollectionPrimaryField(ctx, collectionName);
+        value = selectedEntry.id;
+        displayName = primaryFieldName ? String(selectedEntry[primaryFieldName]) : null;
+    }
+
+    const idIsZero = $derived(value === 0);
 </script>
 
-<!-- THE SELECT BUTTON -->
 {#if !idIsZero}
     <div class="relative">
-        <div
-            class="flex gap-2 absolute right-0 top-0 mr-9 h-full items-center text-xs"
-        >
-            {#if value !== null}
+        <div class="flex gap-2 absolute right-0 top-0 mr-9 h-full items-center text-xs">
+            {#if value != null}
                 <UpdateDetailViewButton
                     collectionName={collectionName}
-                    recordId={value.id}
+                    recordId={value}
                     variant="ghost"
                     class="h-5 w-5 px-0 py-0 text-muted-foreground hover:bg-transparent"
                     Icon={ExternalLink}
                 ></UpdateDetailViewButton>
             {/if}
-            {#if primaryField}
-                <div
-                    class="flex items-center bg-background rounded-full border h-6 px-3 shadow-sm"
-                >
-                    {primaryField}
+            {#if displayName}
+                <div class="flex items-center bg-background rounded-full border h-6 px-3 shadow-sm">
+                    {displayName}
                 </div>
             {/if}
             <SelectRecord
@@ -55,7 +77,7 @@
                 {parentCollectionName}
                 {collectionName}
                 {fieldName}
-                bind:value
+                onSelect={handleSelect}
                 {entry}
             />
         </div>
@@ -66,7 +88,10 @@
                 bg-muted/30 text-xs
                 {destructive ? 'border-destructive bg-destructive/10' : ''}
             "
-            bind:value={() => refrenceId, (v) => (value.id = v)}
+            bind:value={
+                () => value ?? "",
+                (v) => (value = (v === "" || v == null) ? null : Number(v))
+            }
         />
     </div>
 {:else}

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

@@ -2,7 +2,7 @@ interface LocalProps {
     parentCollectionName: string;
     collectionName: string;
     fieldName: string;
-    value?: any;
+    value?: number | null;
     destructive?: boolean;
     entry: Record<string, any>;
 }

package/dist/components/polymorphicInput.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { onMount } from "svelte";
     import Button from "./ui/button/button.svelte";
     import DataTable from "./dataTable/dataTable.svelte";
     import Drawer from "./drawer.svelte";
@@ -7,7 +8,7 @@
     import { getStudioContext } from "../context";
     import { ArrowLeft, Link, ChevronDown } from "lucide-svelte";
 
-    const { ctx } = getStudioContext();
+    const { ctx, lobb } = getStudioContext();
 
     interface Props {
         collectionField: string;
@@ -26,12 +27,28 @@
     }: 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);
+    const selectedId = $derived(entry[idField] ?? null);
 
+    let displayName = $state<string | null>(null);
     let collectionPopoverOpen = $state(false);
     let recordDrawerOpen = $state(false);
 
+    onMount(async () => {
+        if (selectedCollection == null || selectedId == null) return;
+        try {
+            const res = await lobb.findOne(selectedCollection, selectedId);
+            const record = await res.json();
+            const primaryFieldName = getCollectionPrimaryField(ctx, selectedCollection);
+            displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
+        } catch {
+            displayName = null;
+        }
+    });
+
+    $effect(() => {
+        if (entry[idField] == null) displayName = null;
+    });
+
     function onCollectionChange(col: string) {
         collectionPopoverOpen = false;
         if (entry[collectionField] !== col) {
@@ -42,14 +59,13 @@
     function onIdChange(e: Event) {
         const raw = (e.target as HTMLInputElement).value;
         const id = raw === "" ? null : Number(raw);
-        entry = { ...entry, [idField]: id === null ? null : { id } };
+        entry = { ...entry, [idField]: 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 };
+        entry = { ...entry, [idField]: record.id };
+        displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
         recordDrawerOpen = false;
     }
 </script>
@@ -93,9 +109,9 @@
     />
 
     <!-- Primary field badge -->
-    {#if primaryField}
+    {#if displayName}
         <div class="flex shrink-0 items-center bg-background rounded-full border h-6 px-3 shadow-sm">
-            {primaryField}
+            {displayName}
         </div>
     {/if}
 

package/package.json

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

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

@@ -64,7 +64,7 @@
                                 variant="ghost"
                                 class="h-7 px-3 text-xs font-normal"
                                 Icon={Plus}
-                                values={{ [child.field]: { id: recordId } }}
+                                values={{ [child.field]: recordId }}
                                 onSuccessfullSave={async () => { refreshDataTable = !refreshDataTable; }}
                             >
                                 Create

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

@@ -30,8 +30,6 @@
     import {
         buildChildren,
         getDefaultEntry,
-        parseDetailViewValues,
-        serializeEntry,
     } from "../utils";
     import { getChangedProperties } from "../../../utils";
     import type { Snippet } from "svelte";
@@ -50,8 +48,6 @@
         submitButton,
     }: CreateDetailViewProp = $props();
 
-    parseDetailViewValues(ctx, collectionName, values)
-
     const fieldNames = Object.keys(ctx.meta.collections[collectionName].fields);
     let entry: Record<string, any> = $state(
         getDefaultEntry(ctx, fieldNames, collectionName, values),
@@ -88,9 +84,8 @@
             return;
         }
 
-        const serializedEntry = serializeEntry(ctx, collectionName, localEntry);
         const children = buildChildren(ctx, collectionName, localEntry);
-        const response = await lobb.createOne(collectionName, serializedEntry, children);
+        const response = await lobb.createOne(collectionName, localEntry, children);
 
         await emitEvent({ lobb, ctx }, "studio.collections.create", {
             collectionName,

package/src/lib/components/detailView/update/updateDetailView.svelte

@@ -31,7 +31,7 @@
     import { getField, getFieldIcon } from "../../dataTable/utils";
     import DetailViewChildren from "../update/detailViewChildren.svelte";
     import type { Snippet } from "svelte";
-    import { getDefaultEntry, parseDetailViewValues, serializeEntry } from "../utils";
+    import { getDefaultEntry } from "../utils";
     import FieldInput from "../fieldInput.svelte";
   import Drawer from "../../../components/drawer.svelte";
 
@@ -46,8 +46,6 @@
         recordId,
     }: UpdateDetailViewProp = $props();
 
-    parseDetailViewValues(ctx, collectionName, values)
-
     const fieldNames = Object.keys(ctx.meta.collections[collectionName].fields);
     let entry: Record<string, any> = $state(
         getDefaultEntry(ctx, fieldNames, collectionName, values),
@@ -61,7 +59,6 @@
 
     async function handleSave() {
         delete localEntry.id;
-        localEntry = serializeEntry(ctx, collectionName, localEntry);
 
         const children = Object.keys(pendingChildren).length ? pendingChildren : undefined;
         const response = await lobb.updateOne(

package/src/lib/components/detailView/update/updateDetailViewButton.svelte

@@ -4,7 +4,6 @@
 	import Button from "../../../components/ui/button/button.svelte";
 	import UpdateDetailView from "./updateDetailView.svelte";
 	import { getStudioContext } from "../../../context";
-	import { getCollectionParamsFields } from "../../dataTable/utils";
 
 	interface LocalProp extends UpdateDetailViewProp {
 		variant?: ButtonProps["variant"];
@@ -17,11 +16,11 @@
 	let open = $state(false);
 	let values: Record<string, any> | undefined = $state(undefined);
 
-	const { lobb, ctx } = getStudioContext();
+	const { lobb } = getStudioContext();
 
 	async function openView() {
 		const params = {
-			fields: getCollectionParamsFields(ctx, props.collectionName, true),
+			fields: "*",
 			filter: { id: props.recordId },
 			limit: 1,
 		};

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

@@ -1,6 +1,5 @@
 import Mustache from "mustache";
 import type { CTX } from "../../store.types";
-import { isRelationField } from "../../relations";
 import { getField } from "../dataTable/utils";
 import type { DetailFormField } from "./detailViewForm.svelte";
 
@@ -26,34 +25,6 @@ export function getDefaultEntry(ctx: CTX, fieldNames: string[], collectionName:
     );
 }
 
-export function serializeEntry(
-        ctx: CTX,
-        collectionName: string,
-        entry: Record<string, any>,
-) {
-    entry = { ...entry }
-
-    // extract FK object fields → ID
-    for (const [fieldName, fieldValue] of Object.entries(entry)) {
-        const isRefrenceField = isRelationField(ctx, collectionName, fieldName);
-        if (isRefrenceField && fieldValue !== null && fieldValue.id !== undefined) {
-            entry[fieldName] = fieldValue.id;
-        }
-    }
-
-    // extract polymorphic id_field objects → ID
-    for (const relation of ctx.meta.relations) {
-        if (relation.type !== "polymorphic") continue;
-        if ((relation as any).from.collection !== collectionName) continue;
-        const idField = (relation as any).from.id_field;
-        const fieldValue = entry[idField];
-        if (fieldValue !== null && typeof fieldValue === "object" && fieldValue.id !== undefined) {
-            entry[idField] = fieldValue.id;
-        }
-    }
-
-    return entry;
-}
 
 export function buildChildren(
         ctx: CTX,
@@ -72,8 +43,7 @@ export function buildChildren(
         if (!childEntries?.length) continue;
 
         const toCreate = childEntries
-            .filter((e) => !e.id)
-            .map((e) => serializeEntry(ctx, childCollection, e));
+            .filter((e) => !e.id);
         const toLink = childEntries
             .filter((e) => e.id)
             .map((e) => e.id);
@@ -88,45 +58,13 @@ export function buildChildren(
     return Object.keys(children).length ? children : undefined;
 }
 
-export function parseDetailViewValues(ctx: CTX, collectionName: string, values: Record<string, any>) {
-    const forignFieldNames = ctx.meta.relations
-        .filter((relation) => relation.type !== "polymorphic" && relation.from.collection === collectionName)
-        .map((relation) => relation.from.field);
-    const childCollectionNames = ctx.meta.relations
-        .filter((relation) => relation.to.collection === collectionName)
-        .map((relation) => relation.from.collection);
-
-    for (const [key, value] of Object.entries(values)) {
-        if (forignFieldNames.includes(key)) {
-            if (typeof value === 'number') {
-                values[key] = {
-                    id: value,
-                }
-            }
-        } else if (childCollectionNames.includes(key)) {
-            for (let index = 0; index < values[key].length; index++) {
-                parseDetailViewValues(ctx, key, values[key][index]);
-            }
-        }
-    }
-
-    // wrap polymorphic id_field scalar values into { id: value }
-    for (const relation of ctx.meta.relations) {
-        if (relation.type !== "polymorphic") continue;
-        if ((relation as any).from.collection !== collectionName) continue;
-        const idField = (relation as any).from.id_field;
-        if (idField in values && typeof values[idField] === 'number') {
-            values[idField] = { id: values[idField] };
-        }
-    }
-}
 
 export function getCollectionFields(ctx: CTX, collectionName: string) {
     let returnedData: DetailFormField[] = [];
 
     const collectionFields = ctx.meta.collections[collectionName].fields;
     const isSingleton = ctx.meta.collections[collectionName].singleton;
-    for (const [fieldName, value] of Object.entries(collectionFields)) {
+    for (const [fieldName] of Object.entries(collectionFields)) {
 
         if (isSingleton && fieldName === "id") {
             continue;

package/src/lib/components/foreingKeyInput.svelte

@@ -1,14 +1,19 @@
 <script lang="ts">
+    import { onMount } from "svelte";
     import Input from "./ui/input/input.svelte";
     import SelectRecord from "./selectRecord.svelte";
     import UpdateDetailViewButton from "./detailView/update/updateDetailViewButton.svelte";
+    import { getCollectionPrimaryField } from "./dataTable/utils";
+    import { getStudioContext } from "../context";
     import { ExternalLink } from "lucide-svelte";
 
+    const { lobb, ctx } = getStudioContext();
+
     interface LocalProps {
         parentCollectionName: string;
         collectionName: string;
         fieldName: string;
-        value?: any;
+        value?: number | null;
         destructive?: boolean;
         entry: Record<string, any>;
     }
@@ -22,31 +27,48 @@
         entry,
     }: LocalProps = $props();
 
-    const idIsZero = $derived(value?.id === 0);
-    const refrenceId = $derived(value ? value.id : null);
-    const primaryField = $derived(value ? Object.values(value)[1] : null);
+    let displayName = $state<string | null>(null);
+
+    onMount(async () => {
+        if (value == null) return;
+        try {
+            const res = await lobb.findOne(collectionName, value);
+            const record = (await res.json()).data;
+            const primaryFieldName = getCollectionPrimaryField(ctx, collectionName);
+            displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
+        } catch {
+            displayName = null;
+        }
+    });
+
+    $effect(() => {
+        if (value == null) displayName = null;
+    });
+
+    function handleSelect(selectedEntry: any) {
+        const primaryFieldName = getCollectionPrimaryField(ctx, collectionName);
+        value = selectedEntry.id;
+        displayName = primaryFieldName ? String(selectedEntry[primaryFieldName]) : null;
+    }
+
+    const idIsZero = $derived(value === 0);
 </script>
 
-<!-- THE SELECT BUTTON -->
 {#if !idIsZero}
     <div class="relative">
-        <div
-            class="flex gap-2 absolute right-0 top-0 mr-9 h-full items-center text-xs"
-        >
-            {#if value !== null}
+        <div class="flex gap-2 absolute right-0 top-0 mr-9 h-full items-center text-xs">
+            {#if value != null}
                 <UpdateDetailViewButton
                     collectionName={collectionName}
-                    recordId={value.id}
+                    recordId={value}
                     variant="ghost"
                     class="h-5 w-5 px-0 py-0 text-muted-foreground hover:bg-transparent"
                     Icon={ExternalLink}
                 ></UpdateDetailViewButton>
             {/if}
-            {#if primaryField}
-                <div
-                    class="flex items-center bg-background rounded-full border h-6 px-3 shadow-sm"
-                >
-                    {primaryField}
+            {#if displayName}
+                <div class="flex items-center bg-background rounded-full border h-6 px-3 shadow-sm">
+                    {displayName}
                 </div>
             {/if}
             <SelectRecord
@@ -55,7 +77,7 @@
                 {parentCollectionName}
                 {collectionName}
                 {fieldName}
-                bind:value
+                onSelect={handleSelect}
                 {entry}
             />
         </div>
@@ -66,7 +88,10 @@
                 bg-muted/30 text-xs
                 {destructive ? 'border-destructive bg-destructive/10' : ''}
             "
-            bind:value={() => refrenceId, (v) => (value.id = v)}
+            bind:value={
+                () => value ?? "",
+                (v) => (value = (v === "" || v == null) ? null : Number(v))
+            }
         />
     </div>
 {:else}

package/src/lib/components/polymorphicInput.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+    import { onMount } from "svelte";
     import Button from "./ui/button/button.svelte";
     import DataTable from "./dataTable/dataTable.svelte";
     import Drawer from "./drawer.svelte";
@@ -7,7 +8,7 @@
     import { getStudioContext } from "../context";
     import { ArrowLeft, Link, ChevronDown } from "lucide-svelte";
 
-    const { ctx } = getStudioContext();
+    const { ctx, lobb } = getStudioContext();
 
     interface Props {
         collectionField: string;
@@ -26,12 +27,28 @@
     }: 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);
+    const selectedId = $derived(entry[idField] ?? null);
 
+    let displayName = $state<string | null>(null);
     let collectionPopoverOpen = $state(false);
     let recordDrawerOpen = $state(false);
 
+    onMount(async () => {
+        if (selectedCollection == null || selectedId == null) return;
+        try {
+            const res = await lobb.findOne(selectedCollection, selectedId);
+            const record = await res.json();
+            const primaryFieldName = getCollectionPrimaryField(ctx, selectedCollection);
+            displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
+        } catch {
+            displayName = null;
+        }
+    });
+
+    $effect(() => {
+        if (entry[idField] == null) displayName = null;
+    });
+
     function onCollectionChange(col: string) {
         collectionPopoverOpen = false;
         if (entry[collectionField] !== col) {
@@ -42,14 +59,13 @@
     function onIdChange(e: Event) {
         const raw = (e.target as HTMLInputElement).value;
         const id = raw === "" ? null : Number(raw);
-        entry = { ...entry, [idField]: id === null ? null : { id } };
+        entry = { ...entry, [idField]: 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 };
+        entry = { ...entry, [idField]: record.id };
+        displayName = primaryFieldName ? String(record[primaryFieldName]) : null;
         recordDrawerOpen = false;
     }
 </script>
@@ -93,9 +109,9 @@
     />
 
     <!-- Primary field badge -->
-    {#if primaryField}
+    {#if displayName}
         <div class="flex shrink-0 items-center bg-background rounded-full border h-6 px-3 shadow-sm">
-            {primaryField}
+            {displayName}
         </div>
     {/if}