revisions complete

2023-10-15 19:14:07 +03:00
parent 1faac31372
commit 8d3e8373c0
16 changed files with 288 additions and 218 deletions
@@ -221,7 +221,7 @@
        {:else if activeContentTab === "_graph"}
            <Graph {graph} {record}/>
        {:else if activeContentTab === "_info"}
-            <Info bind:record {users} {schema}/>
+            <Info {record} {graph} {users} {schema}/>
        {/if}
    </div>
 </div>
@@ -2,23 +2,26 @@
    import {friendlyDate} from "../../helpers";
    import Avatar from "../account/Avatar.svelte";
    import {usernameById} from "../account/users";
-    import {isEqual} from "lodash";
-    import Status from "./Status.svelte";
+    import {isEqual, sortBy} from "lodash";
    import Icon from "../common/Icon.svelte";
    import RevisionCell from "./revisions/RevisionCell.svelte";
+    import {getContext} from "svelte";
+    import RevisionEdgeRow from "./revisions/RevisionEdgeRow.svelte";

+    const channel = getContext("channel");
    export let record;
+    export let graph;
    export let users;
    export let schema;
+    let revisionSection;
    let rollbackError = "";
    $: revisions = [];
    $: fieldsWithDiff = [];
    $: selectedRevision = null;
-    $: recordEdges = {};
-    $: selectedRevisionEdges = {};
+    $: edgeFieldsDiff = {};

    axios
-        .get(`/records/${record.id}/revisions`)
+        .get(`${channel.lucentUrl}/records/${record.id}/revisions`)
        .then((response) => {
            revisions = response.data;
        })
@@ -26,19 +29,30 @@
            console.log(error);
        });

-    function getEdgesByField(edges) {
-        return schema.fields
-            .filter((f) => ["file", "reference"].includes(f.ui))
-            .reduce((c, f) => {
-                let fieldEdges = edges
-                    .filter((e) => e.field === f.name)
-                    .map((e) =>
-                        record._children.find((child) => child.id === e.to)
-                    );
+    function getEdgesByField(fieldsWithDiff, revision) {

-                c[f.name] = fieldEdges;
-                return c;
-            }, {});
+        edgeFieldsDiff = graph.edges.filter((e) => e.depth === 1).reduce((c, e) => {
+            if (!c[e.field]) {
+                c[e.field] = {
+                    record: [],
+                    revision: [],
+                }
+            }
+            c[e.field]["record"].push(e)
+            return c;
+        }, {});
+
+
+        edgeFieldsDiff = revision._edges.reduce((c, e) => {
+            if (!c[e.field]) {
+                c[e.field] = {
+                    record: [],
+                    revision: [],
+                }
+            }
+            c[e.field]["revision"].push(e)
+            return c;
+        }, edgeFieldsDiff);
    }

    function compare(e, revision) {
@@ -48,6 +62,8 @@
        fieldsWithDiff = schema.fields.filter((f) => {
            return !isEqual(selectedRevision.data[f.name], record.data[f.name]);
        });
+        getEdgesByField(fieldsWithDiff, revision)
+        revisionSection.scrollIntoView();
    }

    function rollback(e) {
@@ -55,7 +71,7 @@
        rollbackError = "";
        axios
            .post(
-                `/records/${record.id}/rollback/${selectedRevision._sys.version}`
+                `${channel.lucentUrl}/records/${record.id}/rollback/${selectedRevision._sys.version}`
            )
            .then((response) => {
                window.location.reload();
@@ -82,16 +98,16 @@
            <div>
                <span class="label text-end text-muted"> created </span>
                <Avatar
-                    name={usernameById(users, record._sys.createdBy)}
-                    side={24}
+                        name={usernameById(users, record._sys.createdBy)}
+                        side={24}
                />
                {friendlyDate(record._sys.createdAt)}
            </div>
            <div>
                <span class="label  text-end text-muted">updated </span>
                <Avatar
-                    name={usernameById(users, record._sys.updatedBy)}
-                    side={24}
+                        name={usernameById(users, record._sys.updatedBy)}
+                        side={24}
                />
                {friendlyDate(record._sys.updatedAt)}
            </div>
@@ -101,42 +117,38 @@
            >Rules for this schema
            </span>
            <small>
-                Revisions are retained for {schema.revisionRetentionDays} days
-                <br/>
-                Each record maintains the last {schema.revisionRetentionNumber}
+                Each record maintains the last {schema.revisions}
                versions
            </small>
        </div>
    </div>
 </div>
 <div class="lx-card  mt-4">
-    {#if schema.revisionRetentionDays > 0}
+    {#if schema.revisions > 0}
        <div class="header-small  mb-3">Revisions</div>
        {#each revisions as revision}
            {#if revision._sys.version != record._sys.version}
                <div
-                    class="row  p-2 rounded"
-                    class:active={revision._sys.version ===
+                        class="row  p-2 rounded"
+                        class:active={revision._sys.version ===
                        selectedRevision?._sys.version}
                >
-                    <div class="col-2">
-                        <Status status={revision.status}/>
-                    </div>
+
                    <div class="col-2">version {revision._sys.version}</div>
                    <div class="col-5">
                        <Avatar
-                            name={usernameById(users, revision._sys.updatedBy)}
-                            side={24}
+                                name={usernameById(users, revision._sys.updatedBy)}
+                                side={24}
                        />
                        {friendlyDate(revision._sys.updatedAt)}
                    </div>

                    <div class="col-3 text-center">
                        <button
-                            disabled={revision._sys.version ===
+                                disabled={revision._sys.version ===
                                selectedRevision?._sys.version}
-                            class="btn btn-sm btn-outline-primary"
-                            on:click={(e) => compare(e, revision)}
+                                class="btn btn-sm btn-outline-primary"
+                                on:click={(e) => compare(e, revision)}
                        >Compare
                        </button
                        >
@@ -150,74 +162,106 @@
        </div>
    {/if}
 </div>
-{#if selectedRevision}
-    <div class="mt-4">
-        {#if fieldsWithDiff.length > 0}
-            <p class="text-center fw-bold mb-3 mt-5">
-                If you choose to rollback to this revision
-            </p>
-            <button
-                on:click={rollback}
-                class="btn  btn-primary mb-5 d-block mx-auto"
-            >
-                Rollback to version {selectedRevision._sys.version}
-            </button>
+<div bind:this={revisionSection}>
+    {#if selectedRevision}
+        <div class="mt-4">
+            {#if fieldsWithDiff.length > 0}
+                <p class="text-center fw-bold mb-3 mt-5">
+                    If you choose to rollback to this revision
+                </p>
+                <button
+                        on:click={rollback}
+                        class="btn  btn-primary mb-5 d-block mx-auto"
+                >
+                    Rollback to version {selectedRevision._sys.version}
+                </button>

-            {#if rollbackError}
-                <span class="d-block text-danger mt-3">{rollbackError}</span>
-            {/if}
-            <div class="mt-3">
-                {#each fieldsWithDiff as field}
-                    <!-- <div
-                        class=" lx-card d-flex p-4 mb-4"
-                        style="overflow:hidden"
-                    > -->
-                    <!-- <div class="d-block" style="width:200px;">
-                            {field.label}
-                        </div> -->
-                    <div
-                        class="lx-card row p-4 mb-4 w-100"
-                        style="overflow:hidden"
-                    >
-                        <div class="col-5">
-                            <RevisionCell
-                                edges={recordEdges}
-                                {field}
-                                side={record.data[field.name]}
-                                colorClass="text-danger"
-                            />
-                        </div>
-                        <div class="col-2">
-                            <div
-                                class="h-100 d-flex align-items-center justify-content-center text-secondary"
-                            >
-                                <span class="me-1">{field.label}</span>
-                                <Icon
-                                    icon="angle-right"
-                                    width="12"
-                                    height="12"
+                {#if rollbackError}
+                    <span class="d-block text-danger mt-3">{rollbackError}</span>
+                {/if}
+                <div class="mt-3">
+                    {#each fieldsWithDiff as field}
+                        <!-- <div
+                            class=" lx-card d-flex p-4 mb-4"
+                            style="overflow:hidden"
+                        > -->
+                        <!-- <div class="d-block" style="width:200px;">
+                                {field.label}
+                            </div> -->
+                        <div
+                                class="lx-card row p-4 mb-4 w-100"
+                                style="overflow:hidden"
+                        >
+                            <div class="col-5">
+                                <RevisionCell
+                                        {field}
+                                        side={record.data[field.name]}
+                                        colorClass="text-danger"
+                                />
+                            </div>
+                            <div class="col-2">
+                                <div
+                                        class="h-100 d-flex align-items-center justify-content-center text-secondary"
+                                >
+                                    <span class="me-1">{field.label}</span>
+                                    <Icon
+                                            icon="angle-right"
+                                            width="12"
+                                            height="12"
+                                    />
+                                </div>
+                            </div>
+                            <div class="col-5">
+                                <RevisionCell
+                                        edges={selectedRevision._edges}
+                                        {field}
+                                        side={selectedRevision.data[field.name]}
+                                        colorClass="text-success"
                                />
                            </div>
                        </div>
-                        <div class="col-5">
-                            <RevisionCell
-                                edges={selectedRevisionEdges}
-                                {field}
-                                side={selectedRevision.data[field.name]}
-                                colorClass="text-success"
-                            />
+                        <!-- </div> -->
+                    {/each}
+                </div>
+            {:else}
+                <div class=" lx-card text-center">
+                    <span>Nothing will change</span>
+                </div>
+            {/if}
+
+            <div class="mt-3">
+                <p class="text-center fw-bold mb-3 mt-5">
+                    Record References
+                </p>
+                {#each Object.entries(edgeFieldsDiff) as [field, edges]}
+                    <div
+                            class="lx-card row p-4 mb-4 w-100"
+                            style="overflow:hidden"
+                    >
+                        <div class="col-4">
+                            {field}:
+                        </div>
+                        <div class="col-8">
+                            <p class="mb-2 text-danger">Record</p>
+                            {#each edges.record as edge}
+                                <RevisionEdgeRow {edge} />
+                            {:else}
+                                <p>No references</p>
+                            {/each}
+                            <p class="mt-4 mb-2 text-success">Revision</p>
+                            {#each edges.revision as edge}
+                                <RevisionEdgeRow {edge} />
+                            {:else}
+                                <p>No references</p>
+                            {/each}
                        </div>
                    </div>
-                    <!-- </div> -->
                {/each}
            </div>
-        {:else}
-            <div class=" lx-card text-center">
-                <span>Nothing will change</span>
-            </div>
-        {/if}
-    </div>
-{/if}
+        </div>
+
+    {/if}
+</div>

 <style>
    .label {
@@ -8,7 +8,7 @@
    export let colorClass;
 </script>

-{#if ["reference", "file"].includes(field.ui)}
+{#if ["reference", "file"].includes(field.info.name)}
    <div class="{colorClass}  field-content">
        <div class="d-flex align-items-center text-center flex-wrap">
            {#each edges[field.name] as edgeRecord}
@@ -31,11 +31,11 @@
            {/each}
        </div>
    </div>
-{:else if field.ui === "json"}
+{:else if ["json", "block"].includes(field.info.name)}
    <div class="{colorClass} field-content" style="white-space: break-spaces;">
        {JSON.stringify(side, null, 2) ?? ""}
    </div>
-{:else if field.ui === "rich"}
+{:else if field.info.name === "rich"}
    <div class="{colorClass}  field-content">{@html side ?? ""}</div>
 {:else}
    <div class="{colorClass}  field-content">{JSON.stringify(side) ?? ""}</div>
@@ -0,0 +1,15 @@
+<script>
+    import Preview from "../../files/Preview.svelte";
+    import PreviewCardSmall from "../PreviewCardSmall.svelte";
+    import {getContext} from "svelte";
+
+    const channel = getContext("channel")
+    export let edge;
+</script>
+
+
+<div>
+    <span class="me-3">Rank: {edge.rank}</span>
+    <span>id: </span> <a href="{channel.lucentUrl}/records/{edge.target}" target="_blank">{edge.target}</a>
+
+</div>
@@ -341,20 +341,19 @@ class RecordController extends Controller
        }
        return ok();
    }
-//
-//    public function rollback(Request $request)
-//    {
-//        try {
-//            $this->recordService->rollback(
-//                userId: AuthService::currentUserId($request),
-//                recordId: $request->route("rid"),
-//                version: (int)$request->route("version")
-//            );
-//        } catch (ValidatorException $th) {
-//            return fail($th->getFirstValidatorError());
-//        } catch (LucentException|Throwable $th) {
-//            return fail($th);
-//        }
-//        return ok();
-//    }
+
+    public function rollback(Request $request)
+    {
+        try {
+            $this->recordService->rollback(
+                recordId: $request->route("rid"),
+                version: (int)$request->route("version")
+            );
+        } catch (ValidatorException $th) {
+            return fail($th->getFirstValidatorError());
+        } catch (LucentException|Throwable $th) {
+            return fail($th);
+        }
+        return ok();
+    }
 }
@@ -4,38 +4,22 @@ namespace Lucent\Http\Controller;

 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use Lucent\Account\Auth;
-use Lucent\Channel\ChannelContext;
 use Lucent\Record\RecordRepo;
 use Lucent\Revision\RevisionRepo;
-use Lucent\Schema\SchemaRepo;
+use Lucent\Revision\RevisionService;
 use function Lucent\Response\fail;
 use function Lucent\Response\ok;

 class RevisionController extends Controller
 {
+    public function __construct(
+        public RevisionService $revisionService
+    ){}

    public function index(Request $request)
    {
-
-        $revisions = RevisionRepo::getByRecordId($request->route("rid"));
-        return ok($revisions);
+        $revisions = $this->revisionService->getByRecordId($request->route("rid"));
+        return ok($revisions->toArray());
    }

-    public function rollback(Request $request)
-    {
-        $schemas = SchemaRepo::all();
-        $revision = RevisionRepo::getByRecordIdAndVersion($request->route("rid"), (int)$request->route("version"));
-
-        try {
-            RecordRepo::replaceMany($schemas, [$revision->toDB()], Auth::currentUserId());
-        } catch (\Lucent\Schema\Validator\ValidatorException $th) {
-            return fail($th->getFirstValidatorError());
-        } catch (\Lucent\LucentException $th) {
-            return fail($th);
-        } catch (\Throwable $th) {
-            return fail($th);
-        }
-        return ok();
-    }
 }
@@ -8,7 +8,7 @@ use Lucent\Http\Controller\FileController;
 use Lucent\Http\Controller\HomeController;
 use Lucent\Http\Controller\MemberController;
 use Lucent\Http\Controller\RecordController;
-use Lucent\Revision\RevisionController;
+use Lucent\Http\Controller\RevisionController;


 Route::group([
@@ -43,8 +43,7 @@ class RecordRepo
    ): void
    {

-        DB::table("records")
-            ->whereIn("id", $ids)->delete();
+        DB::table("records")->whereIn("id", $ids)->delete();
        DB::table("edges")->whereIn("source", $ids)->delete();
        DB::table("edges")->whereIn("target", $ids)->delete();
        DB::table("revisions")->whereIn("recordId", $ids)->delete();
@@ -92,7 +92,7 @@ readonly class RecordService

        RecordRepo::create($record);
        EdgeRepo::update($record->id, $uniqueEdgesCollection);
-        $this->revisionService->create($record);
+        $this->revisionService->create($record,$uniqueEdgesCollection);
        return $record->id;

    }
@@ -119,7 +119,7 @@ readonly class RecordService
        }
        $formattedData = $this->inputFormatter->fill($record->schema, new RecordData($data));

-        $uniqueEdgesCollection = null;
+        $uniqueEdgesCollection = new EdgeCollection();
        if ($updateEdges) {
            $uniqueEdges = collect($edges)
                ->map(function ($edge, $index) {
@@ -161,7 +161,7 @@ readonly class RecordService
            EdgeRepo::update($newRecord->id, $uniqueEdgesCollection);
        }

-        $this->revisionService->create($newRecord);
+        $this->revisionService->create($newRecord,$uniqueEdgesCollection);

    }

@@ -240,6 +240,8 @@ readonly class RecordService
        $this->update(
            id: $revision->recordId,
            data: $revision->data->toArray(),
+            edges: toArray($revision->_edges),
+            updateEdges: true
        );
    }

@@ -3,6 +3,9 @@
 namespace Lucent\Revision;

 use Illuminate\Support\Str;
+use Lucent\Edge\Edge;
+use Lucent\Edge\EdgeCollection;
+use Lucent\Primitive\Collection;
 use Lucent\Record\File;
 use Lucent\Record\Record;
 use Lucent\Record\RecordData;
@@ -13,51 +16,20 @@ readonly class Revision
 {

    function __construct(
-        public string     $id,
-        public string     $recordId,
-        public string     $schema,
-        public System     $_sys,
-        public RecordData $data,
-        public ?File      $_file = null,
+        public string         $id,
+        public string         $recordId,
+        public string         $schema,
+        public System         $_sys,
+        public RecordData     $data,
+        public EdgeCollection $_edges,
+        public ?File          $_file = null,
+
    )
    {
    }

-    public static function fromDB(stdClass $data): Revision
-    {

-        $file = json_decode($data->_file, true);
-        if (!empty($file)) {
-
-            $file = new File(...$file);
-        } else {
-            $file = null;
-        }
-
-        return new Revision(
-            id: $data->id,
-            recordId: $data->recordId,
-            schema: $data->schema,
-            _sys: System::fromArray(json_decode($data->_sys, true)),
-            data: new RecordData(json_decode($data->data, true)),
-            _file: $file,
-        );
-    }
-
-    public function toDB(): array
-    {
-        return [
-            "id" => $this->id,
-            "recordId" => $this->recordId,
-            "schema" => $this->schema,
-            "_sys" => json_encode($this->_sys),
-            "_file" => json_encode($this->_file),
-            "data" => json_encode($this->data),
-        ];
-    }
-
-
-    public static function fromRecord(Record $record): Revision
+    public static function fromRecord(Record $record, EdgeCollection $edges): Revision
    {
        return new Revision(
            id: (string)Str::uuid(),
@@ -65,7 +37,8 @@ readonly class Revision
            schema: $record->schema,
            _sys: $record->_sys,
            data: $record->data,
-            _file: $record->_file,
+            _edges: $edges,
+            _file: $record->_file
        );
    }

@@ -1,26 +0,0 @@
-<?php
-
-namespace Lucent\Revision;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-use function Lucent\Response\ok;
-
-class RevisionController extends Controller
-{
-
-    public function __construct(
-        private readonly RevisionRepo $revisionRepo,
-    )
-    {
-    }
-
-    public function index(Request $request): Response
-    {
-        $revisions = $this->revisionRepo->getByRecordId($request->route("rid"));
-        return ok($revisions->toArray());
-    }
-
-
-}
@@ -3,8 +3,14 @@
 namespace Lucent\Revision;

 use Illuminate\Support\Facades\DB;
+use Lucent\Edge\Edge;
+use Lucent\Edge\EdgeCollection;
 use Lucent\Primitive\Collection;
+use Lucent\Record\File;
+use Lucent\Record\RecordData;
+use Lucent\Record\System;
 use PhpOption\Option;
+use stdClass;

 class RevisionRepo
 {
@@ -13,7 +19,7 @@ class RevisionRepo

    public function create(Revision $revision): string
    {
-        $revisionDB = $revision->toDB();
+        $revisionDB = $this->toDB($revision);
        DB::table($this->table)->insert($revisionDB);
        return $revision->id;
    }
@@ -27,13 +33,28 @@ class RevisionRepo
        $revisions = DB::table($this->table)
            ->where("recordId", $rid)
            ->get()
-            ->map([Revision::class, 'fromDB'])
+            ->map([$this, 'fromDB'])
            ->sortByDesc("_sys.version")
            ->toArray();

        return new Collection($revisions);
    }

+    public function cleanupRecord(string $rid, int $numKeep): void
+    {
+        $revisionIds = DB::table($this->table)
+            ->where("recordId", $rid)
+            ->orderBy("_sys->version", "desc")
+            ->limit(100)
+            ->skip($numKeep)
+            ->get()
+            ->pluck("id");
+
+        DB::table($this->table)
+            ->whereIn("id", $revisionIds)
+            ->delete();
+    }
+

    /**
     * @return Option<Revision>
@@ -49,6 +70,42 @@ class RevisionRepo
            return none();
        }

-        return some(Revision::fromDB($res));
+        return some($this->fromDB($res));
+    }
+
+    public function toDB(Revision $revision): array
+    {
+        return [
+            "id" => $revision->id,
+            "recordId" => $revision->recordId,
+            "schema" => $revision->schema,
+            "_sys" => json_encode($revision->_sys),
+            "_file" => json_encode($revision->_file),
+            "data" => json_encode($revision->data),
+            "_edges" => $revision->_edges->toJson(),
+        ];
+    }
+
+    public function fromDB(stdClass $data): Revision
+    {
+        $file = json_decode($data->_file, true);
+        if (!empty($file)) {
+
+            $file = new File(...$file);
+        } else {
+            $file = null;
+        }
+
+        $edges = array_map(fn($e) => Edge::fromArray($e), json_decode($data->_edges ?? "[]", true));
+
+        return new Revision(
+            id: $data->id,
+            recordId: $data->recordId,
+            schema: $data->schema,
+            _sys: System::fromArray(json_decode($data->_sys, true)),
+            data: new RecordData(json_decode($data->data, true)),
+            _edges: new EdgeCollection(...$edges),
+            _file: $file
+        );
    }
 }
@@ -2,6 +2,10 @@

 namespace Lucent\Revision;

+use Lucent\Channel\ChannelService;
+use Lucent\Edge\Edge;
+use Lucent\Edge\EdgeCollection;
+use Lucent\Primitive\Collection;
 use Lucent\Record\Record;
 use PhpOption\Option;

@@ -9,11 +13,21 @@ readonly class RevisionService
 {

    public function __construct(
+        private ChannelService $channelService,
        private RevisionRepo $revisionRepo,
    )
    {
    }

+    /**
+     * @return Collection<Revision>
+     */
+    public function getByRecordId(string $recordId): Collection
+    {
+
+        return $this->revisionRepo->getByRecordId($recordId);
+    }
+
    /**
     * @return Option<Revision>
     */
@@ -23,10 +37,16 @@ readonly class RevisionService
        return $this->revisionRepo->getByRecordIdAndVersion($recordId, $version);
    }

-    public function create(Record $record): string
+
+    public function create(Record $record, EdgeCollection $edges): void
    {
-        $revision = Revision::fromRecord($record);
-        return $this->revisionRepo->create($revision);
+        $schema = $this->channelService->getSchema($record->schema)->get();
+        if($schema->revisions <= 0){
+            return;
+        }
+        $revision = Revision::fromRecord($record, $edges);
+        $this->revisionRepo->create($revision);
+        $this->revisionRepo->cleanupRecord($record->id,$schema->revisions);
    }


@@ -11,7 +11,6 @@ class CollectionSchema implements Schema
    /**
     * @param Collection<FieldInterface> $fields
     * @param array<string> $visible
-     * @param array<string> $fields
     */
    function __construct(
        public string     $name,
@@ -22,6 +21,7 @@ class CollectionSchema implements Schema
        public bool       $isEntry = false,
        public string     $color = "",
        public string     $titleTemplate = "",
+        public int        $revisions = 0,
    )
    {
    }
@@ -22,6 +22,7 @@ class FilesSchema implements Schema
        public bool       $isEntry = false,
        public string     $color = "",
        public string     $titleTemplate = "",
+        public int        $revisions = 0,
    )
    {
    }
@@ -25,6 +25,7 @@ class SchemaService
                isEntry: $schemaArr["isEntry"] ?? false,
                color: $schemaArr["color"] ?? "",
                titleTemplate: $schemaArr["titleTemplate"] ?? "",
+                revisions: $schemaArr["revisions"] ?? 0,
            ),
            "files" => new FilesSchema(
                name: $schemaArr["name"],
@@ -35,6 +36,7 @@ class SchemaService
                isEntry: $schemaArr["isEntry"] ?? false,
                color: $schemaArr["color"] ?? "",
                titleTemplate: $schemaArr["titleTemplate"] ?? "",
+                revisions: $schemaArr["revisions"] ?? 0,
            ),
            "block" => new BlockSchema(
                name: $schemaArr["name"],