From 129e3af4712588dc9c46225ad0d33a56b8d2e2ef Mon Sep 17 00:00:00 2001
From: lexx <alexlingris@gmail.com>
Date: Sun, 8 Oct 2023 13:46:05 +0300
Subject: [PATCH] build fixes

---
 front/js/svelte/build/Report.svelte  | 56 ++++++++++++++++++------
 front/js/svelte/content/Table.svelte | 64 +++++++++++++++-------------
 2 files changed, 77 insertions(+), 43 deletions(-)

diff --git a/front/js/svelte/build/Report.svelte b/front/js/svelte/build/Report.svelte
index 99fbb20..1a33d13 100644
--- a/front/js/svelte/build/Report.svelte
+++ b/front/js/svelte/build/Report.svelte
@@ -1,5 +1,5 @@
 <script>
-    import {getContext} from "svelte";
+    import {getContext, onMount} from "svelte";
     import SpinnerButton from "../common/SpinnerButton.svelte";
     import ErrorAlert from "../common/ErrorAlert.svelte";
     import MemberSettingsCard from "../members/MemberSettingsCard.svelte";
@@ -10,26 +10,39 @@
     export let title;
     $: date = "";
     $: logs = "";
+    let inProgress = false;
 
+    function connect() {
+        const eventSource = new EventSource(channel.lucentUrl + "/build-report-source");
+
+        eventSource.onmessage = function (event) {
+            inProgress = true;
+            const data = JSON.parse(event.data);
+            date = data.date;
+            logs = data.logs;
+
+        }
+        eventSource.onerror = (e) => {
+            console.log(e)
+            eventSource.close();
+            inProgress = false;
+        }
+    }
 
     function buildWebsite(e) {
         e.preventDefault();
+        inProgress = true;
 
         axios.post(channel.lucentUrl + "/build").then(response => {
-            const eventSource = new EventSource(channel.lucentUrl + "/build-report-source");
-
-            eventSource.onmessage = function(event) {
-                const data = JSON.parse(event.data);
-                date =  data.date;
-                logs =  data.logs;
-            }
-            eventSource.onerror = (e)=>{
-                console.log(e)
-            }
+            connect()
         })
 
     }
 
+    onMount(() => {
+        connect()
+    })
+
 </script>
 
 <div class="wrapper-tiny transparent mb-5">
@@ -37,9 +50,26 @@
 
         <h3 class="header-small mb-5">{title}</h3>
 
-        <button on:click={buildWebsite} class="btn btn-outline-primary btn-sm mb-3">Start Build</button>
+        <button on:click={buildWebsite} class="btn btn-outline-primary btn-sm mb-3" disabled={inProgress}>Start Build
+        </button>
 
-        <div class="mb-3">{date}</div>
+
+
+        <div class="mb-3">
+            {#if inProgress}
+                <span class="badge text-bg-warning">
+                Build in progress
+                    </span>
+            {/if}
+            {#if !inProgress && logs}
+                <span class="badge text-bg-info">
+               Build completed at
+                    </span>
+            {/if}
+            <span class="badge text-bg-light"> {date}</span>
+
+
+        </div>
 
         <pre>{logs}</pre>
     </div>
diff --git a/front/js/svelte/content/Table.svelte b/front/js/svelte/content/Table.svelte
index 72ea7ab..595e76e 100644
--- a/front/js/svelte/content/Table.svelte
+++ b/front/js/svelte/content/Table.svelte
@@ -46,24 +46,24 @@
         <tr>
             <th>
                 <input
-                    on:change|preventDefault={toggleAll}
-                    indeterminate={selected.length > 0 &&
+                        on:change|preventDefault={toggleAll}
+                        indeterminate={selected.length > 0 &&
                             selected.length < records.length}
-                    checked={selected.length == records.length}
-                    class="form-check-input"
-                    type="checkbox"
+                        checked={selected.length == records.length}
+                        class="form-check-input"
+                        type="checkbox"
                 />
             </th>
 
             {#each visibleColumns as field}
                 <th
-                    class="field-ui-{field.ui}"
-                    class:is-sort={"-" + field.name == sort ||
+                        class="field-ui-{field.ui}"
+                        class:is-sort={"-" + field.name == sort ||
                             field.name == sort}
-                    scope="col"
-                    title={field.help}
-                    data-bs-toggle="tooltip"
-                    data-bs-placement="top">{field.label}</th
+                        scope="col"
+                        title={field.help}
+                        data-bs-toggle="tooltip"
+                        data-bs-placement="top">{field.label}</th
                 >
             {/each}
             {#each systemFields.filter(c => schema.visible.includes(c.name)) as sysField}
@@ -76,50 +76,54 @@
             <tr>
                 <td class="title-td">
                     <div
-                        class="title-td-contents d-inline-flex justify-content-between w-100 align-items-center"
+                            class="title-td-contents d-inline-flex justify-content-between w-100 align-items-center"
                     >
                         <div class="d-flex align-items-center ">
                             <div class="form-check">
                                 <input
-                                    on:change={(e) =>
+                                        on:change={(e) =>
                                             selectRecord(e, record)}
-                                    class="form-check-input "
-                                    type="checkbox"
-                                    checked={selected.find(
+                                        class="form-check-input "
+                                        type="checkbox"
+                                        checked={selected.find(
                                             (r) => r.id === record.id
                                         )}
-                                    value={record}
+                                        value={record}
                                 />
                             </div>
 
                             <a
-                                class="me-2 text-decoration-none text-dark fs-6"
-                                href="{channel.lucentUrl}/records/{record.id}"
-                                target={inModal ? "_blank" : "_self"}
+
+                                    class="me-2 text-decoration-none text-dark fs-6"
+                                    href="{channel.lucentUrl}/records/{record.id}"
+                                    target={inModal ? "_blank" : "_self"}
+                                    title={previewTitle(channel.schemas, record, graph)}
+                                    data-bs-toggle="tooltip" data-bs-placement="left"
+
                             >
                                 {previewTitle(channel.schemas, record, graph)}
                             </a>
                         </div>
                         <div>
                             <Avatar
-                                name={usernameById(
+                                    name={usernameById(
                                         users,
                                         record._sys.updatedBy
                                     )}
-                                side={24}
+                                    side={24}
                             />
                         </div>
                     </div>
                 </td>
                 <RecordRow
-                    {record}
-                    {graph}
-                    {schema}
-                    {visibleColumns}
-                    {sort}
-                    {systemFields}
-                    {inModal}
-                    {users}
+                        {record}
+                        {graph}
+                        {schema}
+                        {visibleColumns}
+                        {sort}
+                        {systemFields}
+                        {inModal}
+                        {users}
                 />
             </tr>
         {/each}