From e9c2e82bc3a2ac0804255abed5ab59654605f729 Mon Sep 17 00:00:00 2001
From: lexx <alexlingris@gmail.com>
Date: Wed, 3 Apr 2024 16:25:59 +0300
Subject: [PATCH] who knows

---
 front/js/svelte/newPreview/Preview.svelte  |  2 +-
 front/js/svelte/records/Edit.svelte        |  2 +-
 front/js/svelte/records/Preview.js         | 20 ++++++++++++++++++
 front/js/svelte/records/PreviewCard.svelte | 24 +++-------------------
 front/js/svelte/records/deepEquality.js    |  1 -
 front/js/svelte/records/form/Form.svelte   |  4 ++--
 src/Graph/Record/RecordService.php         |  2 +-
 src/Http/Controller/RecordController.php   | 20 +++++++++---------
 8 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/front/js/svelte/newPreview/Preview.svelte b/front/js/svelte/newPreview/Preview.svelte
index ec55a7e..a5d11c5 100644
--- a/front/js/svelte/newPreview/Preview.svelte
+++ b/front/js/svelte/newPreview/Preview.svelte
@@ -28,7 +28,7 @@
             </div>
         {/if}
         <div class="d-flex flex-md-column " style="line-height: 22px">
-            <span class="">{previewTitle(record)}</span>
+            <a class="text-decoration-none" target="_blank" href="{channel.lucentUrl}/records/{record.id}">{previewTitle(record)}</a>
             <span class="d-flex gap-1 text-muted">
                 {#if record.status === "draft"}
                     <Status status={record.status}/>
diff --git a/front/js/svelte/records/Edit.svelte b/front/js/svelte/records/Edit.svelte
index ec505ae..28178bb 100644
--- a/front/js/svelte/records/Edit.svelte
+++ b/front/js/svelte/records/Edit.svelte
@@ -66,7 +66,7 @@
                             errorMessage = error.response.data.error;
                         } else {
                             validationErrors = error.response.data.error;
-                            console.log(validationErrors)
+                            // console.log(validationErrors)
                         }
                     }
                     resolve(null);
diff --git a/front/js/svelte/records/Preview.js b/front/js/svelte/records/Preview.js
index 9e50957..0812573 100644
--- a/front/js/svelte/records/Preview.js
+++ b/front/js/svelte/records/Preview.js
@@ -20,6 +20,26 @@ export function previewTitle(record) {
     return stripHtml(render.slice(0, 300));
 }
 
+export function previewEdgeTitle(edge) {
+    const channel = getContext("channel");
+    let edgeSchemaName = channel.schemas
+        .find((aSchema) => aSchema.name === edge?.sourceSchema)
+        .fields.find(f => f.name === edge.field).data;
+    let schema = channel.schemas.find((aSchema) => aSchema.name === edgeSchemaName);
+    if (!schema?.titleTemplate) {
+        return noTemplate(schema, edge);
+    }
+
+    let template = Mustache.parse(schema.titleTemplate);
+    let render = Mustache.render(schema.titleTemplate, edge.data);
+
+    if (!render || render === "") {
+        return noTemplate(schema, edge);
+    }
+
+    return stripHtml(render.slice(0, 300));
+}
+
 function noTemplate(schema, record) {
     if (schema?.type === "files") {
         return record._file.path;
diff --git a/front/js/svelte/records/PreviewCard.svelte b/front/js/svelte/records/PreviewCard.svelte
index d544a2f..3a62d4e 100644
--- a/front/js/svelte/records/PreviewCard.svelte
+++ b/front/js/svelte/records/PreviewCard.svelte
@@ -2,7 +2,7 @@
     import Icon from "../common/Icon.svelte";
 
     import {getContext, createEventDispatcher} from "svelte";
-    import {previewTitle} from "./Preview";
+    import {previewEdgeTitle, previewTitle} from "./Preview";
     import Status from "./Status.svelte";
     import Preview from "../newPreview/Preview.svelte";
     import EdgeData from "./form/references/EdgeData.svelte";
@@ -39,7 +39,8 @@
                 style="border-color:{schema.color ?? '#ccc'}; border-width: 1px;"
         >
             <div class="card-body">
-                Edge Data
+                <span class="text-muted d-block">Relation Data</span>
+                {previewEdgeTitle(edge)}
                 <div class="position-absolute d-flex end-0" style="top:5px">
                     <button
                             class="trash-button  text-dark btn btn-sm btn-link"
@@ -59,26 +60,7 @@
             style="border-color:{schema.color ?? '#ccc'}; border-width: 1px;"
     >
         <div class="card-body">
-
             <Preview {record} type="card"/>
-
-            <!--        <div class="overflow-hidden">-->
-            <!--            <a-->
-            <!--                class="title-link m-0 fs-5 text-decoration-none text-dark d-block"-->
-            <!--                href="{channel.lucentUrl}/records/{record.id}"-->
-            <!--                title={cardTitle}-->
-            <!--            >-->
-            <!--                {cardTitle}-->
-            <!--            </a>-->
-            <!--            <small class="text-muted">-->
-            <!--                {schema.label}-->
-            <!--            </small>-->
-            <!--            <small class="text-muted">-->
-            <!--                {#if record.status === "draft"}-->
-            <!--                    <Status status={record.status} />-->
-            <!--                {/if}-->
-            <!--            </small>-->
-            <!--        </div>-->
         </div>
 
         {#if hasDelete}
diff --git a/front/js/svelte/records/deepEquality.js b/front/js/svelte/records/deepEquality.js
index 4d95a46..1668761 100644
--- a/front/js/svelte/records/deepEquality.js
+++ b/front/js/svelte/records/deepEquality.js
@@ -1,6 +1,5 @@
 import { deepEqual } from 'fast-equals';
 export function isEqual(obj1, obj2) {
-
     return deepEqual(obj1, obj2);
     // if (obj1 === obj2) return true;
     //
diff --git a/front/js/svelte/records/form/Form.svelte b/front/js/svelte/records/form/Form.svelte
index 5d1e779..251177f 100644
--- a/front/js/svelte/records/form/Form.svelte
+++ b/front/js/svelte/records/form/Form.svelte
@@ -36,7 +36,7 @@
         originalContent = {
             data: JSON.parse(JSON.stringify(data)),
             status: status,
-            edges: JSON.parse(JSON.stringify(graph?.map(r => r.edge.target+r.edge.field) ?? [])),
+            edges: JSON.parse(JSON.stringify(graph?.map(r => r.edge.target+r.edge.field) ?? [])).sort(),
         };
         hasUnsavedData = checkUnsavedData();
 
@@ -75,7 +75,7 @@
         return !isEqual(originalContent, {
             data: data,
             status: status,
-            edges: graph?.map(r => r.edge.target+r.edge.field) ?? [],
+            edges: graph?.map(r => r.edge.target+r.edge.field).sort() ?? [],
         });
     }
 </script>
diff --git a/src/Graph/Record/RecordService.php b/src/Graph/Record/RecordService.php
index 2494553..1d200dd 100644
--- a/src/Graph/Record/RecordService.php
+++ b/src/Graph/Record/RecordService.php
@@ -80,7 +80,7 @@ readonly class RecordService
      */
     public function update(UpdateRecordData $data): Result
     {
-        $record = $this->query->filter(["id" => $data->id])->run()->rootRecords->first();
+        $record = $this->query->run(fn($builder)=>$builder->filter(["id" => $data->id]))->rootRecords->first();
 
         if (empty($record)) {
             return Error::create("Record id is missing");
diff --git a/src/Http/Controller/RecordController.php b/src/Http/Controller/RecordController.php
index a369669..a0d7fa7 100644
--- a/src/Http/Controller/RecordController.php
+++ b/src/Http/Controller/RecordController.php
@@ -233,6 +233,8 @@ class RecordController extends Controller
         }
 
         $schema = $this->channelService->getSchema($record->schema)->get();
+
+//        $recordHistory = $this->recordManager->fromSession($request->session())->push($rid)->getRecords($rid);
         return $this->svelte->render(
             layout: "channel",
             view: "recordEdit",
@@ -242,7 +244,7 @@ class RecordController extends Controller
                 "graph" => $this->editorTree->toEditor($graph->tree()->first()),
                 "record" => toArray($record),
                 "users" => $this->accountService->all(),
-                "recordHistory" => $recordHistory,
+                "recordHistory" => $recordHistory ?? [],
                 "isWritable" => in_array($record->schema, $this->accountService->currentWritableSchemas())
             ]
         );
@@ -342,15 +344,13 @@ class RecordController extends Controller
             return result($res);
         }
 
-        $newGraph = $this->query
-            ->filter(["id" => $recordId])
-            ->limit(1)
-            ->skip(0)
-            ->childrenDepth(2)
-            ->childrenLimit(200)
-            ->parentsDepth(1)
-            ->parentsLimit(200)
-            ->run();
+        $newGraph = $this->query->run(
+            fn($builder) => $builder->filter(["id" => $recordId])
+                ->limit(1)
+                ->skip(0)
+                ->childrenDepth(1)
+                ->childrenLimit(500)
+        );
 
 
         return result(Success::create([