lots

front/js/svelte/records/Edit.svelte

@@ -24,7 +24,7 @@
     export let isCreateMode;
     export let users;
     let originalContent;
-    let activeContentTab = "_default";
+    let activeContentTab = "";
     let recordGraph = null;
     $: hasUnsavedData = false;
     $: validationErrors = null;
@@ -38,16 +38,6 @@
         (f) => f.name !== "id"
     );
 
-    let tabname = "_default";
-    let fieldToTabs = schema.fields.reduce((c, f) => {
-        if (f.ui === "tab") {
-            tabname = f.name;
-            return c;
-        }
-
-        c[tabname] = [...(c[tabname] ?? []), f.name];
-        return c;
-    }, []);
 
     onMount(() => {
         setOriginalContent();
@@ -56,6 +46,8 @@
     function setOriginalContent() {
         originalContent = {
             data: JSON.parse(JSON.stringify(record.data)),
+            schema: record.schema,
+            status: record.status,
             _sys: JSON.parse(JSON.stringify(record._sys)),
             _file: JSON.parse(JSON.stringify(record._file)),
             edges: JSON.parse(JSON.stringify(graph.edges)),
@@ -88,6 +80,8 @@
         }
         return !isEqual(originalContent, {
             data: record.data,
+            schema: record.schema,
+            status: record.status,
             _sys: record._sys,
             _file: record._file,
             edges: graph.edges,
@@ -165,34 +159,34 @@
 
     {#if !["_graph", "_info"].includes(activeContentTab)}
         <div
-            style="position:fixed;bottom:0;left:0px;width:100%;background:rgba(255,255,255,.7);z-index:10"
+                style="position:fixed;bottom:0;left:0px;width:100%;background:rgba(255,255,255,.7);z-index:10"
         >
             <div
-                class="d-flex mt-4 mb-3 align-items-center justify-content-center"
+                    class="d-flex mt-4 mb-3 align-items-center justify-content-center"
             >
-                <StatusSelect bind:status={record._sys.status} {schema}/>
+                <StatusSelect bind:status={record.status} {schema}/>
                 {#if isCreateMode}
                     <button
-                        class="ms-2 btn btn-primary btn-spinner"
-                        on:click={save}
+                            class="ms-2 btn btn-primary btn-spinner"
+                            on:click={save}
                     >
                             <span
-                                class="spinner-border spinner-border-sm"
-                                role="status"
-                                aria-hidden="true"
+                                    class="spinner-border spinner-border-sm"
+                                    role="status"
+                                    aria-hidden="true"
                             />
                         Create
                     </button>
                 {:else if hasUnsavedData}
                     <button
-                        type="button"
-                        class="ms-2 btn btn-primary btn-spinner"
-                        on:click={save}
+                            type="button"
+                            class="ms-2 btn btn-primary btn-spinner"
+                            on:click={save}
                     >
                             <span
-                                class="spinner-border spinner-border-sm"
-                                role="status"
-                                aria-hidden="true"
+                                    class="spinner-border spinner-border-sm"
+                                    role="status"
+                                    aria-hidden="true"
                             />
                         Save
                     </button>
@@ -205,25 +199,25 @@
 
     <div class=" mt-4" style="margin-bottom:150px">
         <ContentTabs
-            {schema}
-            {isCreateMode}
-            bind:active={activeContentTab}
-            {record}
-            bind:recordGraph
+                {schema}
+                {isCreateMode}
+                bind:active={activeContentTab}
+                {record}
+                bind:recordGraph
         />
         {#if !["_graph", "_info"].includes(activeContentTab)}
             <FilePreview {record} {schema}/>
             <!-- <fieldset disabled="disabled"> -->
             {#each activeFields as field (field.name)}
-                {#if fieldToTabs[activeContentTab].includes(field.name)}
+                {#if activeContentTab === field.group}
                     <FormField
-                        bind:data={record.data}
-                        bind:graph={graph}
-                        {field}
-                        {schema}
-                        {record}
-                        {validationErrors}
-                        {isCreateMode}
+                            bind:data={record.data}
+                            bind:graph={graph}
+                            {field}
+                            {schema}
+                            {record}
+                            {validationErrors}
+                            {isCreateMode}
                     />
                 {/if}
             {/each}