From bd7d28ce0e01f8f3a3d835c7f0055fcca40f4f69 Mon Sep 17 00:00:00 2001
From: Vargha Csongor <Culisa1023@gmail.com>
Date: Wed, 30 Apr 2025 00:27:54 +0200
Subject: [PATCH] fixup render on creation

---
 apps/app/src/lib/graph/FamilyEdge.svelte     |  2 +-
 apps/app/src/lib/graph/connection.ts         |  2 +-
 apps/app/src/lib/profile/create/Modal.svelte | 11 ++++++-----
 apps/app/src/lib/sidebar/sideBar.svelte      |  2 +-
 apps/app/src/routes/+page.svelte             | 11 ++++++-----
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/app/src/lib/graph/FamilyEdge.svelte b/apps/app/src/lib/graph/FamilyEdge.svelte
index 2174eb6..3df4420 100644
--- a/apps/app/src/lib/graph/FamilyEdge.svelte
+++ b/apps/app/src/lib/graph/FamilyEdge.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { components } from '$lib/api/api.gen.ts';
 	import { child, spouse, parent, sibling } from '$lib/paraglide/messages';
-	import { getSmoothStepPath, BaseEdge, EdgeLabelRenderer, type EdgeProps } from '@xyflow/svelte';
+	import { getSmoothStepPath, BaseEdge, type EdgeProps } from '@xyflow/svelte';
 
 	let {
 		sourceX,
diff --git a/apps/app/src/lib/graph/connection.ts b/apps/app/src/lib/graph/connection.ts
index 8acc638..67a6648 100644
--- a/apps/app/src/lib/graph/connection.ts
+++ b/apps/app/src/lib/graph/connection.ts
@@ -2,7 +2,7 @@ import type { Connection } from '@xyflow/svelte';
 import type { EdgeBase } from '@xyflow/system';
 
 export function isValidConnection(edge: EdgeBase | Connection) {
-	if (edge.source !== edge.target) {
+	if (Number(edge.source) !== Number(edge.target)) {
 		return true;
 	}
 
diff --git a/apps/app/src/lib/profile/create/Modal.svelte b/apps/app/src/lib/profile/create/Modal.svelte
index 640c801..99f715d 100644
--- a/apps/app/src/lib/profile/create/Modal.svelte
+++ b/apps/app/src/lib/profile/create/Modal.svelte
@@ -96,17 +96,18 @@
 			}
 			let data = (await response.json()) as {
 				person?: components['schemas']['Person'];
-				relationships?: components['schemas']['Relationship'][];
+				relationships?: components['schemas']['dbtypeRelationship'][];
 			};
 			if (onCreation !== undefined) {
 				let edges: Array<Edge> = [];
 				data.relationships?.map((relationship) =>
 					edges.push({
-						id: String(relationship.id),
-						source: String(relationship.start),
-						target: String(relationship.end),
+						id: String(relationship.Id),
+						source: String(relationship.StartElementId),
+						target: String(relationship.EndElementId),
 						data: {
-							...relationship.properties
+							...relationship.Props,
+							type: relationship.Type
 						}
 					})
 				);
diff --git a/apps/app/src/lib/sidebar/sideBar.svelte b/apps/app/src/lib/sidebar/sideBar.svelte
index 585d28b..7c92fcd 100644
--- a/apps/app/src/lib/sidebar/sideBar.svelte
+++ b/apps/app/src/lib/sidebar/sideBar.svelte
@@ -6,6 +6,6 @@
 	<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay"></label>
 	<ul class="menu bg-base-200 text-base-content min-h-full w-80 p-4 gap-4 pt-16">
 		<!-- Sidebar content here -->
-		<li><button class="btn btn-primary">{managed_profiles()}</button></li>
+		<li><button class="btn btn-primary" aria-label="close sidebar">{managed_profiles()}</button></li>
 	</ul>
 </div>
diff --git a/apps/app/src/routes/+page.svelte b/apps/app/src/routes/+page.svelte
index 511c5be..3ab14b5 100644
--- a/apps/app/src/routes/+page.svelte
+++ b/apps/app/src/routes/+page.svelte
@@ -37,8 +37,6 @@
 	let with_out_spouse = $state(false);
 
 	let familyTreeDAG = new FamilyTree();
-	let nodes = $state.raw<Node[]>([]);
-	let edges = $state.raw<Edge[]>([]);
 	let layout = familyTreeDAG.getLayoutedElements(
 		data.Nodes,
 		data.Edges,
@@ -46,8 +44,11 @@
 		tailwindClassToPixels('h-40') || 160,
 		'TB'
 	);
-	nodes = layout.Nodes;
-	edges = layout.Edges;
+	console.log('layout', layout);
+	console.log('dagEdges',familyTreeDAG.edges());
+	console.log('dagNodes',familyTreeDAG.nodes());
+	let nodes = $state.raw<Node[]>(layout.Nodes);
+	let edges = $state.raw<Edge[]>(layout.Edges);
 
 	let relationshipStart: number | null = $state(null);
 	let createPerson = $state(false);
@@ -134,7 +135,7 @@
 			tailwindClassToPixels('h-40') || 160,
 			'TB'
 		);
-
+		console.log('newLayout', newLayout);
 		edges = newLayout.Edges;
 		nodes = newLayout.Nodes;
 	};