{#if isWritable}
select(record)}
+ on:change={() => select(queryRecord.record)}
class="form-check-input "
type="checkbox"
checked={selected.find(
- (r) => r.id === record.id
+ (r) => r.id === queryRecord.record.id
)}
- value={record}
+ value={queryRecord}
/>
{/if}
-
{record._file.path}{queryRecord.record._file.path}
{record._file.mime}{queryRecord.record._file.mime}
select(queryRecord)}
+ on:change={() => select(queryRecord.record)}
class="form-check-input "
type="checkbox"
checked={selected.find(
@@ -89,11 +89,11 @@
class="me-2 text-decoration-none text-dark fs-6"
href="{channel.lucentUrl}/records/{queryRecord.record.id}"
target={inModal ? "_blank" : "_self"}
- title={previewTitle(queryRecord)}
+ title={previewTitle(queryRecord.record)}
data-bs-toggle="tooltip" data-bs-placement="left"
>
- {previewTitle(queryRecord)}
+ {previewTitle(queryRecord.record)}
diff --git a/front/js/svelte/edges/sortEdges.js b/front/js/svelte/edges/sortEdges.js
index 282ec62..856eef1 100644
--- a/front/js/svelte/edges/sortEdges.js
+++ b/front/js/svelte/edges/sortEdges.js
@@ -1,9 +1,9 @@
-export function sortByField(from, to, edges, fieldName) {
+export function sortByField(from, to, queryRecords, fieldName) {
if (from === to) {
- return edges;
+ return queryRecords;
}
- let edgesTosort = edges?.filter((ed) => ed.field === fieldName && ed.depth === 1 ) ?? [];
- let remainingEdge = edges?.filter((ed) => !(ed.field === fieldName && ed.depth === 1)) ?? [];
+ let edgesTosort = queryRecords?.filter((qr) => qr.edge.field === fieldName && qr.edge.depth === 1 ) ?? [];
+ let remainingEdge = queryRecords?.filter((qr) => !(qr.edge.field === fieldName && qr.edge.depth === 1)) ?? [];
edgesTosort = array_move(edgesTosort,from, to);
return [...remainingEdge, ...edgesTosort];
diff --git a/front/js/svelte/libs/Sortable.svelte b/front/js/svelte/libs/Sortable.svelte
index d3ef4fa..06168af 100644
--- a/front/js/svelte/libs/Sortable.svelte
+++ b/front/js/svelte/libs/Sortable.svelte
@@ -4,7 +4,7 @@
export let sortableClass = "";
// export let handle;
export let isTable = false;
- export let sortableInstance;
+ export let sortableInstance = null;
const dispatch = createEventDispatcher();
let sortableContainer;
@@ -18,7 +18,7 @@
easing: "cubic-bezier(1, 0, 0, 1)",
onUpdate: function (/**Event*/ evt) {
// reorder(evt.oldIndex,evt.newIndex);
- console.log(evt)
+ // console.log(evt)
dispatch("update", {
source: evt.oldIndex,
target: evt.newIndex,
diff --git a/front/js/svelte/newPreview/Preview.svelte b/front/js/svelte/newPreview/Preview.svelte
index 00ddd49..ec55a7e 100644
--- a/front/js/svelte/newPreview/Preview.svelte
+++ b/front/js/svelte/newPreview/Preview.svelte
@@ -1,61 +1,65 @@
-
-
-
-
- })
+
+ {:else}
+
+
+ .{record._file.path.split(".").pop()}
+
+ {/if}
+{/if}
diff --git a/front/js/svelte/newPreview/preview/PreviewEdge.svelte b/front/js/svelte/newPreview/preview/PreviewEdge.svelte
deleted file mode 100644
index c409ba3..0000000
--- a/front/js/svelte/newPreview/preview/PreviewEdge.svelte
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
+
diff --git a/front/js/svelte/records/EditHeader.svelte b/front/js/svelte/records/EditHeader.svelte
index 44bd3ca..e06f2a9 100644
--- a/front/js/svelte/records/EditHeader.svelte
+++ b/front/js/svelte/records/EditHeader.svelte
@@ -2,18 +2,18 @@
import {getContext} from "svelte";
import Icon from "../common/Icon.svelte";
import {previewTitle} from "./Preview";
+ import axios from "axios";
const channel = getContext("channel");
export let schema;
- export let graph;
export let record;
+ export let title;
export let isCreateMode;
- export let activeContentTab;
function clone(e) {
e.preventDefault();
axios.post(channel.lucentUrl + "/records/clone/" + record.id).then(response => {
- window.location = channel.lucentUrl + "/records/" + response.data.id;
+ window.location.href = channel.lucentUrl + "/records/" + response.data.id;
}).catch(error => {
});
@@ -22,25 +22,29 @@
{schema.label.toUpperCase()}
{#if !isCreateMode}
- {previewTitle( record, graph)}
+ {#if record}
+ {previewTitle(record)}
+ {:else}
+ { title}
+ {/if}
{:else}
New Record
{/if}
- {#if !isCreateMode}
+ {#if !isCreateMode && !!record}
{/if}
diff --git a/front/js/svelte/records/FormField.svelte b/front/js/svelte/records/FormField.svelte
index a43eb31..c9f8d74 100644
--- a/front/js/svelte/records/FormField.svelte
+++ b/front/js/svelte/records/FormField.svelte
@@ -1,24 +1,23 @@
- {#if field.data}
-
-
- {#if hasDelete}
-
-
-
+
+ {#if edge?.data}
+
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
diff --git a/front/js/svelte/newPreview/includes/File.svelte b/front/js/svelte/newPreview/includes/File.svelte
new file mode 100644
index 0000000..64b049a
--- /dev/null
+++ b/front/js/svelte/newPreview/includes/File.svelte
@@ -0,0 +1,60 @@
+
+
+{#if record}
+ {#if record._file.mime.startsWith("image")}
+
+
+ Edge Data
{/if}
+
+ {#if record._file}
+
+
+ {/if}
+
+ {previewTitle(record)}
+
+ {#if record.status === "draft"}
+
+ {/if}
+ {schema.label}
+
+
+
+
+ {:else}
+
+
-
-
-
-
diff --git a/front/js/svelte/records/ContentTabs.svelte b/front/js/svelte/records/ContentTabs.svelte
index 7197ae5..81ec122 100644
--- a/front/js/svelte/records/ContentTabs.svelte
+++ b/front/js/svelte/records/ContentTabs.svelte
@@ -1,7 +1,5 @@
diff --git a/front/js/svelte/records/Edit.svelte b/front/js/svelte/records/Edit.svelte
index a236d32..6fe0a73 100644
--- a/front/js/svelte/records/Edit.svelte
+++ b/front/js/svelte/records/Edit.svelte
@@ -1,112 +1,43 @@
-
- {#if schema.type === "files"}
-
-
-
- {/if}
-
-
- {cardTitle}
-
-
- {schema.label}
-
-
- {#if record.status === "draft"}
-
- {/if}
-
-
-
-
{schema.label.toUpperCase()}
{#if !isCreateMode}
- {previewTitle( record, graph)}
+ {#if record}
+ {previewTitle(record)}
+ {:else}
+ { title}
+ {/if}
{:else}
New Record
{/if}
- {#if !isCreateMode}
+ {#if !isCreateMode && !!record}
@@ -48,25 +52,25 @@
Record Actions
Create new
{#if !isCreateMode}
Clone
{/if}
-
- (activeContentTab = "_info")}
- class="dropdown-item"
- href="{channel.lucentUrl}">Revisions
+
+
+
+
+
+
Record Actions
Create new {#if !isCreateMode} Clone {/if} - - (activeContentTab = "_info")} - class="dropdown-item" - href="{channel.lucentUrl}">Revisions + + + + + +
- aSchema.name === record.record?.schema);
+ let schema = channel.schemas.find((aSchema) => aSchema.name === record?.schema);
if (!schema?.titleTemplate) {
- return noTemplate(schema, record.record);
+ return noTemplate(schema, record);
}
- let recordData = record.record.data;
let template = Mustache.parse(schema.titleTemplate);
- let referencePreviews = template
- .filter(segment => segment[0] === "name") // keep only template tags
- .map((segment) => segment[1]) // map to fieldNames
- .filter(fieldName => { // keep only references
- let schemaField = schema.fields.find(f => f.name === fieldName)
- return schemaField?.info.name === "reference";
- }).reduce((carry, fieldName) => { // map to records
- let child = record._children[fieldName].find(c => c.record.id === record.record.id);
- carry[field] = previewTitle(child);
- return carry;
- }, {});
- recordData = {...recordData, ...referencePreviews}
-
- let render = Mustache.render(schema.titleTemplate, recordData);
+ let render = Mustache.render(schema.titleTemplate, record.data);
if (!render || render === "") {
- return noTemplate(schema, record.record);
+ return noTemplate(schema, record);
}
return stripHtml(render.slice(0, 300));
@@ -42,7 +28,6 @@ function noTemplate(schema, record) {
let title = stripHtml(
record?.data[schema.fields.filter((f) => f.info.name === "text")[0]?.name]
).slice(0, 300);
-
if (title === "") {
return "Untitled";
}
diff --git a/front/js/svelte/records/PreviewCard.svelte b/front/js/svelte/records/PreviewCard.svelte
index bba8c45..d6b95bc 100644
--- a/front/js/svelte/records/PreviewCard.svelte
+++ b/front/js/svelte/records/PreviewCard.svelte
@@ -1,62 +1,84 @@
-
- {#if schema.type === "files"}
-
- {#each currentReferences as reference (reference.record.id)}
-
-{/if}
-
diff --git a/front/js/svelte/records/elements/Reference.svelte b/front/js/svelte/records/elements/Reference.svelte
index bfa1000..3e6ada8 100644
--- a/front/js/svelte/records/elements/Reference.svelte
+++ b/front/js/svelte/records/elements/Reference.svelte
@@ -1,8 +1,8 @@
-
-
+
+
+
+
diff --git a/front/js/svelte/records/form/references/Reference.svelte b/front/js/svelte/records/form/references/Reference.svelte
new file mode 100644
index 0000000..90b4f47
--- /dev/null
+++ b/front/js/svelte/records/form/references/Reference.svelte
@@ -0,0 +1,98 @@
+
+
+
+ {#each currentReferences as reference (reference.record.id)}
+
+{/if}
+
diff --git a/front/js/svelte/records/elements/ReferenceTags.svelte b/front/js/svelte/records/form/references/ReferenceTags.svelte
similarity index 89%
rename from front/js/svelte/records/elements/ReferenceTags.svelte
rename to front/js/svelte/records/form/references/ReferenceTags.svelte
index 8ff4a6e..96d1647 100644
--- a/front/js/svelte/records/elements/ReferenceTags.svelte
+++ b/front/js/svelte/records/form/references/ReferenceTags.svelte
@@ -1,14 +1,14 @@
-
+
+
{#if hasDelete}
-
-
- {cardTitle}
-
-
- {schema.label}
-
-
- {#if record.status === "draft"}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -66,9 +88,11 @@
.card .trash-button {
display: none;
}
+
.card:hover .trash-button {
display: block;
}
+
.title-link {
overflow: hidden;
white-space: nowrap;
diff --git a/front/js/svelte/records/StatusSelect.svelte b/front/js/svelte/records/StatusSelect.svelte
deleted file mode 100644
index 72bff6b..0000000
--- a/front/js/svelte/records/StatusSelect.svelte
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
+ {#if editable}
+
+ {/if}
+
{/if}
-
diff --git a/front/js/svelte/records/block/elements/File.svelte b/front/js/svelte/records/block/elements/File.svelte
index 2ede75a..b271baf 100644
--- a/front/js/svelte/records/block/elements/File.svelte
+++ b/front/js/svelte/records/block/elements/File.svelte
@@ -4,8 +4,8 @@
import {sortByField} from "../../../edges/sortEdges";
import ReferenceInlineButtons from "../../elements/ReferenceInlineButtons.svelte"
import Sortable from "../../../libs/Sortable.svelte";
- import {insertEdges} from "../../elements/reference";
- import BrowseModal from "../../elements/BrowseModal.svelte";
+ import {insertEdges} from "../../form/references/reference.js";
+ import BrowseModal from "../../form/references/BrowseModal.svelte";
const channel = getContext("channel");
diff --git a/front/js/svelte/records/block/elements/Reference.svelte b/front/js/svelte/records/block/elements/Reference.svelte
index 7937f22..78e4711 100644
--- a/front/js/svelte/records/block/elements/Reference.svelte
+++ b/front/js/svelte/records/block/elements/Reference.svelte
@@ -4,7 +4,7 @@
import {sortByField} from "../../../edges/sortEdges";
import ReferenceInlineButtons from "../../elements/ReferenceInlineButtons.svelte"
import Sortable from "../../../libs/Sortable.svelte";
- import {insertEdges} from "../../elements/reference";
+ import {insertEdges} from "../../form/references/reference.js";
const channel = getContext("channel");
diff --git a/front/js/svelte/records/deepEquality.js b/front/js/svelte/records/deepEquality.js
new file mode 100644
index 0000000..1668761
--- /dev/null
+++ b/front/js/svelte/records/deepEquality.js
@@ -0,0 +1,34 @@
+import { deepEqual } from 'fast-equals';
+export function isEqual(obj1, obj2) {
+ return deepEqual(obj1, obj2);
+ // if (obj1 === obj2) return true;
+ //
+ // if (Array.isArray(obj1) && Array.isArray(obj2)) {
+ //
+ // if(obj1.length !== obj2.length) return false;
+ //
+ // return obj1.every((elem, index) => {
+ // return isEqual(elem, obj2[index]);
+ // })
+ //
+ //
+ // }
+ //
+ // if(typeof obj1 === "object" && typeof obj2 === "object" && obj1 !== null && obj2 !== null) {
+ // if(Array.isArray(obj1) || Array.isArray(obj2)) return false;
+ //
+ // const keys1 = Object.keys(obj1)
+ // const keys2 = Object.keys(obj2)
+ //
+ // if(keys1.length !== keys2.length || !keys1.every(key => keys2.includes(key))) return false;
+ //
+ // for(let key in obj1) {
+ // if (!isEqual(obj1[key], obj2[key])) { return false; }
+ // }
+ //
+ // return true;
+ //
+ // }
+ //
+ // return false;
+}
\ No newline at end of file
diff --git a/front/js/svelte/records/elements/File.svelte b/front/js/svelte/records/elements/File.svelte
deleted file mode 100644
index 298faf3..0000000
--- a/front/js/svelte/records/elements/File.svelte
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
-
-
-
-
-
-
- {#if channel.previewTarget}
-
- Preview
-
- {/if}
-
- {#if field.collections.length === 1}
-
- {:else}
-
-{#if currentReferences.length > 0}
-
-
-
-
- {/if}
-
-
- {/each}
-
-
diff --git a/front/js/svelte/records/elements/reference.js b/front/js/svelte/records/elements/reference.js
deleted file mode 100644
index f6e0274..0000000
--- a/front/js/svelte/records/elements/reference.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import {uniqBy} from "lodash";
-
-export function insertEdges(graph, sourceRecord, targetRecords, fieldName, action = "") {
- let newEdges = targetRecords.map((r) => {
- return {
- target: r.id,
- source: sourceRecord.id,
- sourceSchema: sourceRecord.schema,
- targetSchema: r.schema,
- field: fieldName,
- depth: 1,
- rank: ""
- };
- });
-
- let replacedEdges = graph.edges;
- if (action === "replace") {
- replacedEdges = replacedEdges.filter((edge) => edge.field !== field.name);
- }
-
- graph.records = uniqBy([...graph.records, ...targetRecords], (r) => r.id);
- graph.edges = uniqBy([...replacedEdges, ...newEdges], (edge) => edge.source + edge.target + edge.field + edge.depth);
- return graph;
-}
diff --git a/front/js/svelte/records/elements/FieldHeader.svelte b/front/js/svelte/records/form/FieldHeader.svelte
similarity index 100%
rename from front/js/svelte/records/elements/FieldHeader.svelte
rename to front/js/svelte/records/form/FieldHeader.svelte
diff --git a/front/js/svelte/records/form/Form.svelte b/front/js/svelte/records/form/Form.svelte
new file mode 100644
index 0000000..8c48c2e
--- /dev/null
+++ b/front/js/svelte/records/form/Form.svelte
@@ -0,0 +1,122 @@
+
+
+
-
-
-
- {#if field.help}
- {field.help}
- {/if}
-{field.name}
-
+
diff --git a/front/js/svelte/records/form/FormField.svelte b/front/js/svelte/records/form/FormField.svelte
new file mode 100644
index 0000000..e2f1e85
--- /dev/null
+++ b/front/js/svelte/records/form/FormField.svelte
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
diff --git a/front/js/svelte/records/form/ReferenceField.svelte b/front/js/svelte/records/form/ReferenceField.svelte
new file mode 100644
index 0000000..f1003d0
--- /dev/null
+++ b/front/js/svelte/records/form/ReferenceField.svelte
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/front/js/svelte/records/form/SaveButtons.svelte b/front/js/svelte/records/form/SaveButtons.svelte
new file mode 100644
index 0000000..f1844b4
--- /dev/null
+++ b/front/js/svelte/records/form/SaveButtons.svelte
@@ -0,0 +1,47 @@
+
+
+
\ No newline at end of file
diff --git a/front/js/svelte/records/form/StatusSelect.svelte b/front/js/svelte/records/form/StatusSelect.svelte
new file mode 100644
index 0000000..ba3a3ec
--- /dev/null
+++ b/front/js/svelte/records/form/StatusSelect.svelte
@@ -0,0 +1,47 @@
+
+{#if status}
+
+
+
+{/if}
\ No newline at end of file
diff --git a/front/js/svelte/records/elements/Checkbox.svelte b/front/js/svelte/records/form/fields/Checkbox.svelte
similarity index 96%
rename from front/js/svelte/records/elements/Checkbox.svelte
rename to front/js/svelte/records/form/fields/Checkbox.svelte
index 28b3aa6..14afc80 100644
--- a/front/js/svelte/records/elements/Checkbox.svelte
+++ b/front/js/svelte/records/form/fields/Checkbox.svelte
@@ -1,5 +1,5 @@
+
+
+
+
+
+
+
+
+ {#if field.collections.length === 1}
+
+ {:else}
+
+{#if currentReferences.length > 0}
+
+
+
+
+ {/if}
+
+
+ {/each}
+