@lobb-js/studio 0.28.6 → 0.29.1

package/src/lib/components/dataTableDrawer/dataTableDrawer.svelte

@@ -4,6 +4,7 @@
     import DataTable from "../dataTable/dataTable.svelte";
     import Drawer from "../drawer.svelte";
     import type { TableProps } from "../dataTable/table.svelte";
+    import type { CollectionTab } from "../../store.types";
 
     interface Props {
         collectionName: string;
@@ -13,6 +14,7 @@
         showFooter?: boolean;
         tableProps?: Partial<TableProps>;
         position?: "side" | "bottom";
+        tabs?: CollectionTab[];
         onClose?: () => void;
     }
 
@@ -24,6 +26,7 @@
         showFooter = true,
         tableProps,
         position = "side",
+        tabs,
         onClose,
     }: Props = $props();
 </script>
@@ -47,7 +50,7 @@
             {showHeader}
             {showFooter}
             {tableProps}
-            unifiedBgColor="bg-background"
+            {tabs}
         />
     </div>
 </Drawer>

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

@@ -2,7 +2,7 @@
     import { getStudioContext } from "../../../context";
     import { Link } from "lucide-svelte";
     import CreateManyView from "./createManyView.svelte";
-    import ExtensionsComponents from "../../../components/extensionsComponents.svelte";
+    import ExtensionsComponents from "../../extensionsComponents.svelte";
     import { getExtensionUtils } from "../../../extensions/extensionUtils";
 
     const { ctx, lobb } = getStudioContext();
@@ -37,7 +37,7 @@
                     parentCollectionName={collectionName}
                     collectionName={child.collection}
                     parentRecord={{ id: entry.id, collectionName }}
-                    class="bg-muted/30 border rounded-md overflow-hidden"
+                    class="bg-muted-soft border rounded-md overflow-hidden"
                     bind:value={entry[child.collection]}
                 >
                     <CreateManyView

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

@@ -8,114 +8,142 @@
         collectionName: string;
         values?: Record<string, any>;
         showRelatedRecords?: boolean;
-        rollback?: boolean;
         submitButton?: SubmitButton;
         title?: Snippet<[string]>;
         onSuccessfullSave?: (entry: any) => Promise<void>;
         onCancel?: () => Promise<void>;
+        changes?: import("../utils").Changes | undefined;
     }
 </script>
 
 <script lang="ts">
     import { ArrowLeft, Plus, X } from "lucide-svelte";
-    import Button from "../../../components/ui/button/button.svelte";
+    import Button from "../../ui/button/button.svelte";
     import { getStudioContext } from "../../../context";
     import { toast } from "svelte-sonner";
+    import { untrack } from "svelte";
 
     const { lobb, ctx } = getStudioContext();
-    import ExtensionsComponents from "../../extensionsComponents.svelte";
-    import { getExtensionUtils } from "../../../extensions/extensionUtils";
-    import { getField, getFieldIcon } from "../../dataTable/utils";
     import Children from "./children.svelte";
-    import {
-        buildChildren,
-        getDefaultEntry,
-    } from "../utils";
+    import { buildChildren, getDefaultEntry } from "../utils";
+    import type { Changes } from "../utils";
     import { getChangedProperties } from "../../../utils";
     import type { Snippet } from "svelte";
-    import FieldInput from "../fieldInput.svelte";
-    import { emitEvent } from "../../../eventSystem";
-    import Drawer from "../../../components/drawer.svelte";
+    import DetailView from "../detailView.svelte";
+    import Drawer from "../../drawer.svelte";
 
     let {
         collectionName,
-        values = {},
+        values: passedValues = {} as Record<string, any>,
         showRelatedRecords = true,
-        rollback = false,
         onCancel,
         onSuccessfullSave,
         title,
         submitButton,
+        changes: passedChanges = $bindable<Changes | undefined>(undefined),
     }: CreateDetailViewProp = $props();
 
+    const isRecordingMode = passedChanges !== undefined;
+    if (!isRecordingMode) passedChanges = { data: {}, children: {} };
+    const changes = passedChanges as Changes;
+
     const fieldNames = Object.keys(ctx.meta.collections[collectionName].fields);
-    let entry: Record<string, any> = $state(
-        getDefaultEntry(ctx, fieldNames, collectionName, values),
-    );
-    const initialEntry = $state.snapshot(entry);
+    let values = $state(getDefaultEntry(ctx, fieldNames, collectionName, passedValues));
     let fieldsErrors: Record<string, any> = $state({});
-    const subCollections = ctx.meta.relations.filter((relation) => relation.to.collection === collectionName).map((relation) => relation.from.collection);
+
+    const childCollections = ctx.meta.relations
+        .filter((r) => r.to.collection === collectionName)
+        .map((r) => (r as any).from.collection);
+
     const subCollectionsValues: Record<string, any> = {};
-    for (let index = 0; index < subCollections.length; index++) {
-        const subCollection = subCollections[index];
-        if (values[subCollection]) {
-            subCollectionsValues[subCollection] = values[subCollection];
-        }
+    for (const col of childCollections) {
+        if (passedValues[col]) subCollectionsValues[col] = passedValues[col];
     }
 
-    async function handleSave() {
-        let localEntry = getChangedProperties(initialEntry, $state.snapshot(entry));
+    $effect(() => {
+        const snap = $state.snapshot(values);
 
-        await emitEvent({ lobb, ctx }, "studio.collections.preCreate", {
-            collectionName,
-            entry: localEntry,
-        });
+        untrack(() => {
+            const data: Record<string, any> = {};
+            const children: Record<string, any> = {};
 
-        // remove empty children records data
-        for (const [key, value] of Object.entries(localEntry)) {
-            if (Array.isArray(value) && !value.length) {
-                delete localEntry[key];
+            for (const [key, value] of Object.entries(snap)) {
+                if (childCollections.includes(key) && Array.isArray(value)) {
+                    children[key] = {
+                        created: (value as any[]).filter((r) => !r.id).map((r) => ({ data: r })),
+                        updated: [],
+                        deleted: [],
+                        linked: (value as any[]).filter((r) => r.id).map((r) => r.id),
+                        unlinked: [],
+                    };
+                } else if (value !== null && value !== undefined && value !== '') {
+                    data[key] = value;
+                }
             }
-        }
 
-        if (rollback) {
-            if (onSuccessfullSave) await onSuccessfullSave(localEntry);
-            onCancel?.();
-            return;
+            changes.data = data;
+            changes.children = children;
+
+            if (!isRecordingMode) {
+                console.log(`[${collectionName}] changes:`, $state.snapshot(changes));
+            }
+        });
+    });
+
+    function handleCancel() {
+        if (isRecordingMode) {
+            changes.data = {};
+            changes.children = {};
         }
+        onCancel?.();
+    }
 
-        const children = buildChildren(ctx, collectionName, localEntry);
-        const response = await lobb.createOne(collectionName, localEntry, children);
+    async function handleSave() {
+        const snap = $state.snapshot(changes);
 
-        await emitEvent({ lobb, ctx }, "studio.collections.create", {
-            collectionName,
-            entry: localEntry,
-            response: response,
-        });
+        const children = buildChildren(ctx, collectionName, { ...snap.data, ...Object.fromEntries(
+            Object.entries(snap.children).map(([col, ops]) => [
+                col,
+                [
+                    ...(ops.created.map((op) => op.data)),
+                    ...(ops.linked.map((id) => ({ id }))),
+                ]
+            ])
+        )});
+
+        const response = await lobb.createOne(collectionName, snap.data, children, undefined, isRecordingMode);
+
+        if (response.status === 204) {
+            if (onSuccessfullSave) await onSuccessfullSave(snap);
+            toast.success(`The record was successfully created`);
+            handleCancel();
+            return;
+        }
 
         if (!response.bodyUsed) {
-            let result = await response.json();
+            const result = await response.json();
             if (response.status >= 400) {
                 if (result.message && result.details) {
                     fieldsErrors = result.details;
                     return;
                 } else if (result.message) {
+                    toast.error(result.message);
                     return;
                 }
             }
         }
 
-        if (onSuccessfullSave) await onSuccessfullSave(localEntry);
+        if (onSuccessfullSave) await onSuccessfullSave(snap);
         toast.success(`The record was successfully created`);
         onCancel?.();
     }
 </script>
 
-<Drawer onHide={onCancel}>
+<Drawer onHide={handleCancel}>
     <div class="flex h-12 items-center gap-4 border-b px-4">
         <Button
             variant="outline"
-            onclick={onCancel}
+            onclick={handleCancel}
             class=" h-8 w-8 rounded-full text-xs font-normal"
             Icon={ArrowLeft}
         ></Button>
@@ -131,51 +159,16 @@
         </div>
     </div>
     <div class="flex-1 overflow-y-auto">
-        <div class="flex flex-col gap-4 p-4">
-            {#each fieldNames as fieldName}
-                {#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>
-                        <FieldInput
-                            {collectionName}
-                            {fieldName}
-                            bind:value={
-                                () => entry[fieldName],
-                                (v) => (entry = { ...entry, [fieldName]: v })
-                            }
-                            bind:entry
-                            errorMessages={fieldsErrors[fieldName]}
-                        />
-                    </div>
-                {/if}
-            {/each}
-        </div>
+        <DetailView {collectionName} bind:entry={values} {fieldsErrors} />
         {#if showRelatedRecords}
-            <Children {collectionName} values={subCollectionsValues} bind:entry />
+            <Children {collectionName} values={subCollectionsValues} bind:entry={values} />
         {/if}
     </div>
     <div class="flex h-12 items-center justify-end gap-2 border-t px-4">
         <div class="flex gap-3">
             <Button
                 variant="outline"
-                onclick={onCancel}
+                onclick={handleCancel}
                 class="h-7 px-3 text-xs font-normal"
                 Icon={X}
             >

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

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { CreateDetailViewProp } from "./createDetailView.svelte";
-	import type { ButtonProps } from "../../../components/ui/button/button.svelte";
-	import Button from "../../../components/ui/button/button.svelte";
+	import type { ButtonProps } from "../../ui/button/button.svelte";
+	import Button from "../../ui/button/button.svelte";
 	import CreateDetailView from "./createDetailView.svelte";
 
 	interface LocalProp extends CreateDetailViewProp {

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

@@ -11,11 +11,15 @@
     import Table, { type TableProps } from "../../dataTable/table.svelte";
     import Button from "../../ui/button/button.svelte";
     import CreateDetailViewButton from "./createDetailViewButton.svelte";
-    import { getCollectionColumns } from "../../../components/dataTable/utils";
-    import SelectRecord from "../../../components/selectRecord.svelte";
-    import FieldCell from "../../../components/dataTable/fieldCell.svelte";
+    import type { Changes } from "../utils";
+
+    let addChanges = $state<Changes>({ data: {}, children: {} });
+    let editChanges = $state<Changes>({ data: {}, children: {} });
+    import { getCollectionColumns } from "../../dataTable/utils";
+    import SelectRecord from "../../selectRecord.svelte";
+    import FieldCell from "../../dataTable/fieldCell.svelte";
     import SubRecords from "./subRecords.svelte";
-    import ListViewChildren from "../../../components/dataTable/listViewChildren.svelte";
+    import ListViewChildren from "../../dataTable/listViewChildren.svelte";
     import { getStudioContext } from "../../../context";
 
     const { ctx } = getStudioContext();
@@ -108,7 +112,7 @@
 >
     <div
         class="
-            flex items-center justify-between px-2 h-10 bg-muted/30
+            flex items-center justify-between px-2 h-10 bg-muted-soft
             {expanded ? 'border-b' : ''}
         "
     >
@@ -141,7 +145,7 @@
                 class="h-7 px-2 font-normal text-xs"
                 Icon={Plus}
                 {collectionName}
-                rollback={true}
+                changes={addChanges}
                 showRelatedRecords={true}
                 onSuccessfullSave={onRecordAdd}
                 values={createValues}
@@ -161,13 +165,12 @@
         </div>
     </div>
     {#if expanded}
-        <div bind:clientWidth={tableWidth} class="bg-muted/30 overflow-auto">
+        <div bind:clientWidth={tableWidth} class="bg-muted-soft overflow-auto">
             <Table
                 data={entries}
                 {columns}
                 selectByColumn="id"
                 showCollapsible={doesCollectionHasChildren}
-                unifiedBgColor="bg-muted/30"
             >
                 {#snippet tools(entry, index)}
                     <Button
@@ -197,7 +200,7 @@
                             class="h-6 w-6 text-muted-foreground hover:bg-transparent p-0"
                             Icon={Pencil}
                             {collectionName}
-                            rollback={true}
+                            changes={editChanges}
                             showRelatedRecords={true}
                             onSuccessfullSave={(entry) =>
                                 onRecordOverride(entry, index)}
@@ -236,7 +239,6 @@
                             {collectionName}
                             recordId={entry.id}
                             width={tableWidth}
-                            unifiedBgColor="bg-muted/30"
                         />
                     {:else}
                         <SubRecords

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

@@ -0,0 +1,81 @@
+<script lang="ts">
+    import { CircleHelp } from "lucide-svelte";
+    import * as Tooltip from "../ui/tooltip";
+    import { getStudioContext } from "../../context";
+    import ExtensionsComponents from "../extensionsComponents.svelte";
+    import { getExtensionUtils } from "../../extensions/extensionUtils";
+    import { getField, getFieldIcon } from "../dataTable/utils";
+    import FieldInput from "./fieldInput.svelte";
+
+    interface Props {
+        collectionName: string;
+        entry: Record<string, any>;
+        fieldsErrors?: Record<string, string[]>;
+    }
+
+    let {
+        collectionName,
+        entry = $bindable(),
+        fieldsErrors = {},
+    }: Props = $props();
+
+    const { lobb, ctx } = getStudioContext();
+    const fieldNames = $derived(
+        Object.keys(ctx.meta.collections[collectionName].fields),
+    );
+</script>
+
+<div class="flex flex-col gap-4 p-4">
+    {#each fieldNames as fieldName}
+        {#if !ctx.meta.collections[collectionName].fields[fieldName]?.ui?.hidden}
+            {@const field = getField(ctx, fieldName, collectionName)}
+            {@const FieldIcon = getFieldIcon(ctx, fieldName, collectionName)}
+            {@const description = ctx.meta.collections[collectionName].fields[fieldName]?.description}
+            <div class="flex flex-col gap-2">
+                <div class="flex flex-1 items-end justify-between gap-2 text-xs">
+                    <div class="flex items-center gap-1.5">
+                        <ExtensionsComponents
+                            name="detailView.field.label"
+                            utils={getExtensionUtils(lobb, ctx)}
+                            {collectionName}
+                            {fieldName}
+                            bind:value={entry[fieldName]}
+                        >
+                            <div class="flex items-center gap-1.5">
+                                <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>
+                        </ExtensionsComponents>
+                        {#if description}
+                            <Tooltip.Root>
+                                <Tooltip.Trigger>
+                                    <CircleHelp size="12" class="text-muted-foreground" />
+                                </Tooltip.Trigger>
+                                <Tooltip.Content class="max-w-64 text-xs">
+                                    {description}
+                                </Tooltip.Content>
+                            </Tooltip.Root>
+                        {/if}
+                    </div>
+                    <div>
+                        <ExtensionsComponents
+                            name="dvFields.topRight.{collectionName}.{fieldName}"
+                            utils={getExtensionUtils(lobb, ctx)}
+                            bind:value={entry[fieldName]}
+                        />
+                    </div>
+                </div>
+                <FieldInput
+                    {collectionName}
+                    {fieldName}
+                    bind:value={entry[fieldName]}
+                    bind:entry
+                    errorMessages={fieldsErrors[fieldName]}
+                />
+            </div>
+        {/if}
+    {/each}
+</div>

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

@@ -6,7 +6,7 @@
 	import Button from "../ui/button/button.svelte";
 	import FieldCustomInput from "./fieldCustomInput.svelte";
 	import Input from "../ui/input/input.svelte";
-	import * as Select from "../../components/ui/select/index";
+	import * as Select from "../ui/select/index";
 	import EnumBadge from "../dataTable/enumBadge.svelte";
 	import type { EnumOption } from "@lobb-js/core";
 	import Textarea from "../ui/textarea/textarea.svelte";
@@ -86,7 +86,7 @@
 		{:else if field.label === "id"}
 			<Input
 				placeholder="AUTO GENERATED"
-				class="bg-muted/30 text-xs"
+				class="bg-muted-soft text-xs"
 				bind:value
 			/>
 		{:else if fieldRelationTarget && entry}
@@ -126,7 +126,7 @@
 			>
 				<Select.Trigger
 					class="
-						h-9 w-full bg-muted/30 pr-8
+						h-9 w-full bg-muted-soft pr-8
 						{destructive ? 'border-destructive bg-destructive/10' : ''}
 					"
 				>
@@ -158,7 +158,7 @@
 				placeholder={ui?.placeholder ? ui.placeholder : "NULL"}
 				type="text"
 				class="
-					bg-muted/30 text-xs
+					bg-muted-soft text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value
@@ -168,7 +168,7 @@
 				placeholder={ui?.placeholder ? ui.placeholder : value === "" ? "EMPTY STRING" : "NULL"}
 				rows={5}
 				class="
-					bg-muted/30 text-xs
+					bg-muted-soft text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value
@@ -178,7 +178,7 @@
 				type="date"
 				placeholder={ui?.placeholder ? ui.placeholder : "NULL"}
 				class="
-					dateInput block w-full bg-muted/30 pr-9 text-xs
+					dateInput block w-full bg-muted-soft pr-9 text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value={
@@ -197,7 +197,7 @@
 				type="time"
 				placeholder={ui?.placeholder ? ui.placeholder : "NULL"}
 				class="
-					dateInput block w-full bg-muted/30 pr-9 text-xs
+					dateInput block w-full bg-muted-soft pr-9 text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value={
@@ -215,7 +215,7 @@
 				type="datetime-local"
 				placeholder={ui?.placeholder ? ui.placeholder : "NULL"}
 				class="
-					dateInput block w-full bg-muted/30 pr-9 text-xs
+					dateInput block w-full bg-muted-soft pr-9 text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value={
@@ -236,7 +236,7 @@
 				<Select.Trigger
 					placeholder={ui?.placeholder ? ui.placeholder : "NULL"}
 					class="
-						bg-muted/30 pr-9
+						bg-muted-soft pr-9
 						{destructive ? 'border-destructive bg-destructive/10' : ''}
 					"
 				>
@@ -263,7 +263,7 @@
 				type="number"
 				step="any"
 				class="
-					bg-muted/30 text-xs
+					bg-muted-soft text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value
@@ -273,7 +273,7 @@
 				placeholder={ui?.placeholder ? ui.placeholder : "NULL"}
 				type="number"
 				class="
-					bg-muted/30 text-xs
+					bg-muted-soft text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value

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

@@ -2,7 +2,7 @@
 	import { Ban, Check, CircleAlert, X } from "lucide-svelte";
 	import Button from "../ui/button/button.svelte";
 	import Input from "../ui/input/input.svelte";
-	import * as Select from "../../components/ui/select/index";
+	import * as Select from "../ui/select/index";
 	import Textarea from "../ui/textarea/textarea.svelte";
   	import type { EntryField } from "./detailViewForm.svelte";
   	import type { Snippet } from "svelte";
@@ -49,7 +49,7 @@
 				placeholder={field.placeholder ? field.placeholder : "NULL"}
 				type="text"
 				class="
-					bg-muted/30 text-xs
+					bg-muted-soft text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value
@@ -64,7 +64,7 @@
 				<Select.Trigger
 					placeholder={field.placeholder ? field.placeholder : "NULL"}
 					class="
-						h-9 w-full bg-muted/30 pr-8
+						h-9 w-full bg-muted-soft pr-8
 						{destructive ? 'border-destructive bg-destructive/10' : ''}
 					"
 				>
@@ -84,7 +84,7 @@
 					placeholder={field.placeholder ? field.placeholder : value === "" ? "EMPTY STRING" : "NULL"}
 					rows={5}
 					class="
-						bg-muted/30 text-xs
+						bg-muted-soft text-xs
 						{destructive ? 'border-destructive bg-destructive/10' : ''}
 					"
 					bind:value
@@ -98,7 +98,7 @@
 			<Input
 				type="date"
 				class="
-					dateInput block w-full bg-muted/30 pr-9 text-xs
+					dateInput block w-full bg-muted-soft pr-9 text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value={
@@ -116,7 +116,7 @@
 			<Input
 				type="time"
 				class="
-					dateInput block w-full bg-muted/30 pr-9 text-xs
+					dateInput block w-full bg-muted-soft pr-9 text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value={
@@ -133,7 +133,7 @@
 			<Input
 				type="datetime-local"
 				class="
-					dateInput block w-full bg-muted/30 pr-9 text-xs
+					dateInput block w-full bg-muted-soft pr-9 text-xs
 					{destructive ? 'border-destructive bg-destructive/10' : ''}
 				"
 				bind:value={
@@ -154,7 +154,7 @@
 				<Select.Root type="single" bind:value>
 					<Select.Trigger
 						class="
-							bg-muted/30 pr-9
+							bg-muted-soft pr-9
 							{destructive ? 'border-destructive bg-destructive/10' : ''}
 						"
 					>

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

@@ -21,7 +21,7 @@
 <Input
     type="password"
     placeholder="••••••"
-    class="bg-muted/30 text-xs {destructive ? 'border-destructive bg-destructive/10' : ''}"
+    class="bg-muted-soft text-xs {destructive ? 'border-destructive bg-destructive/10' : ''}"
     value={displayValue}
     oninput={onInput}
 />