lucent/lucent-laravel
2
0
Fork 0
Code Issues 14 Pull Requests Releases 1 Activity

fix sort

Browse Source
This commit is contained in:
Alex Lingris
2024-05-22 17:05:25 +03:00
parent 584fe7eb95
commit 069ae72705
9 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/js/svelte/edges/sortEdges.js
+6 -2
View File
@@ -1,8 +1,12 @@
export function sortByField(from, to, edges, fieldName) {
export function sortByField(from, to, edges, fieldName, references) {
if (from === to) {
return edges;
}
let edgesTosort = edges?.filter((ed) => ed.field === fieldName && ed.depth === 1 ) ?? [];
let referenceIds = references.map(r => r.id);
let edgesTosort = edges?.filter((ed) => ed.field === fieldName && ed.depth === 1 && referenceIds.includes(ed.target)) ?? [];
let remainingEdge = edges?.filter((ed) => !(ed.field === fieldName && ed.depth === 1)) ?? [];
edgesTosort = array_move(edgesTosort,from, to);
front/js/svelte/libs/Sortable.svelte
+1 -1
View File
@@ -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,
front/js/svelte/records/block/elements/File.svelte
+1 -1
View File
@@ -41,7 +41,7 @@
}
function reorder(e) {
graph.edges = sortByField(e.detail.source, e.detail.target, graph.edges, blockFieldName);
graph.edges = sortByField(e.detail.source, e.detail.target, graph.edges, blockFieldName, references);
}
function insert(e) {
front/js/svelte/records/block/elements/Reference.svelte
+1 -1
View File
@@ -35,7 +35,7 @@
}
function reorder(e) {
graph.edges = sortByField(e.detail.source, e.detail.target, graph.edges, blockFieldName);
graph.edges = sortByField(e.detail.source, e.detail.target, graph.edges, blockFieldName, references);
}
function insert(e) {
front/js/svelte/records/elements/File.svelte
+17 -16
View File
@@ -12,11 +12,10 @@
export let graph
let browseModal;
$: references = graph?.edges
.filter((edge) => edge.field === field.name)
.map((edge) => {
return graph.records.find((increc) => increc.id == edge.target && record.id == edge.source);
return graph.records.find((increc) => increc.id === edge.target && record.id === edge.source);
}).filter((rec) => (rec?.id ? true : false)) ?? [];
let collections = channel.schemas.filter((aschema) =>
@@ -36,7 +35,9 @@
}
async function reorder(e) {
graph.edges = await sortByField(e.detail.source, e.detail.target, graph.edges, field.name);
graph.edges = await sortByField(e.detail.source, e.detail.target, graph.edges, field.name, references);
}
function insert(e) {
@@ -68,18 +69,18 @@
<div class="mb-0">
{#if field.collections.length === 1}
<button
class="btn btn-outline-primary"
on:click={(e) => openBrowseModal(e, collections[0].name)}
class="btn btn-outline-primary"
on:click={(e) => openBrowseModal(e, collections[0].name)}
>
Browse
</button>
{:else}
<div class="dropdown d-inline-block">
<button
class="btn btn-outline-primary btn-sm"
type="button"
data-bs-toggle="dropdown"
aria-expanded="false"
class="btn btn-outline-primary btn-sm"
type="button"
data-bs-toggle="dropdown"
aria-expanded="false"
>
Browse
</button>
@@ -88,10 +89,10 @@
<li>
<!-- {`${channelurl}/content/${collection.name}?parent=${record.id}&parentfield=${field.name}`} -->
<a
class="dropdown-item"
on:click={(e) =>
class="dropdown-item"
on:click={(e) =>
openBrowseModal(e, collection.name)}
href="/">{collection.label}</a
href="/">{collection.label}</a
>
</li>
{/each}
@@ -104,10 +105,10 @@
{#each references as reference (reference.id)}
<div class="col mb-3">
<PreviewCard
classes="h-100"
record={reference}
hasDelete={true}
on:remove={removeReference}
classes="h-100"
record={reference}
hasDelete={true}
on:remove={removeReference}
/>
</div>
{/each}
front/js/svelte/records/elements/Reference.svelte
+3 -1
View File
@@ -14,6 +14,7 @@
export let validationErrors;
$: errorMessage = getErrorMessage(validationErrors, field.name);
$: references = graph.edges
.filter((edge) => edge.field === field.name)
.map((edge) => {
@@ -32,7 +33,8 @@
}
function reorder(e) {
graph.edges = sortByField(e.detail.source, e.detail.target, graph.edges, field.name);
graph.edges = sortByField(e.detail.source, e.detail.target, graph.edges, field.name, references);
}
function insert(e) {
front/js/svelte/records/elements/ReferenceInline.svelte
+1 -1
View File
@@ -119,7 +119,7 @@
}
function move(e, from, to) {
graph.edges = sortByField(from, to, graph.edges, field.name);
graph.edges = sortByField(from, to, graph.edges, field.name, references);
}
</script>
front/js/svelte/records/elements/ReferenceTable.svelte
+1 -1
View File
@@ -57,7 +57,7 @@
function reorder(e) {
graph.edges = sortByField(e.detail.source, e.detail.target, graph.edges, field.name);
graph.edges = sortByField(e.detail.source, e.detail.target, graph.edges, field.name, references);
}
front/js/svelte/records/elements/ReferenceTags.svelte
+3 -9
View File
@@ -1,14 +1,8 @@
<script>
import {getContext} from "svelte";
import {uniqBy, debounce} from "lodash";
import {debounce} from "lodash";
import {previewTitle} from "../Preview";
import {getErrorMessage} from "./errorMessage";
import {sortByField} from "../../edges/sortEdges";
import ReferenceInlineButtons from "./ReferenceInlineButtons.svelte";
import Sortable from "../../libs/Sortable.svelte";
import RenderField from "../../content/RenderField.svelte";
import Icon from "../../common/Icon.svelte";
import Datalist from "./Datalist.svelte";
import {insertEdges} from "./reference.js";
const channel = getContext("channel");
@@ -52,7 +46,7 @@
})
.then((response) => {
searchOptions = [];
insert(e,response.data.records[0]);
insert(e, response.data.records[0]);
console.log(response)
})
.catch((error) => {
@@ -63,7 +57,7 @@
function insert(e, insertRecord) {
e.preventDefault();
graph = insertEdges(graph,record,[insertRecord],field.name,e.detail.action);
graph = insertEdges(graph, record, [insertRecord], field.name, e.detail.action);
}
const updateResults = debounce((e) => {