From ca155eeeb80dfbf32888451345fb1651d770e959 Mon Sep 17 00:00:00 2001
From: Kiril Videlov <kiril@videlov.com>
Date: Tue, 27 Jun 2023 18:23:58 +0200
Subject: [PATCH] dnd dropzone uses virtualbranch create

---
 src/routes/projects_new/[projectId]/+page.svelte         | 9 +--------
 src/routes/projects_new/[projectId]/Board.svelte         | 7 +------
 .../projects_new/[projectId]/NewBranchDropZone.svelte    | 7 +++----
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/routes/projects_new/[projectId]/+page.svelte b/src/routes/projects_new/[projectId]/+page.svelte
index 0b6a415ab..9882e8176 100644
--- a/src/routes/projects_new/[projectId]/+page.svelte
+++ b/src/routes/projects_new/[projectId]/+page.svelte
@@ -2,7 +2,6 @@
 	import Board from './Board.svelte';
 	import Tray from './Tray.svelte';
 	import type { PageData } from './$types';
-	import type { Branch } from './types';
 	import { getStore } from './vbranches';
 	import { Value } from 'svelte-loadable-store';
 
@@ -15,18 +14,12 @@
 		? $virtualBranches.value
 		: [];
 	let targetChoice = 'origin/master'; // prob should check if it exists
-
-	function handleNewBranch(e: CustomEvent<Branch[]>) {
-		let name = e.detail[0].name;
-		let path = e.detail[0].files[0].path;
-		virtualBranches.createBranch(name, path);
-	}
 </script>
 
 {#if target}
 	<div class="flex w-full max-w-full">
 		<Tray bind:branches {target} remoteBranches={remoteBranchesData} {virtualBranches} />
-		<Board bind:branches {projectId} {virtualBranches} on:newBranch={handleNewBranch} />
+		<Board bind:branches {projectId} {virtualBranches} />
 	</div>
 {:else}
 	<div class="m-auto flex flex-col space-y-2">
diff --git a/src/routes/projects_new/[projectId]/Board.svelte b/src/routes/projects_new/[projectId]/Board.svelte
index c945e0f1e..05bd75bd8 100644
--- a/src/routes/projects_new/[projectId]/Board.svelte
+++ b/src/routes/projects_new/[projectId]/Board.svelte
@@ -28,11 +28,6 @@
 		}
 		branches = branches;
 	}
-
-	function handleUpdateRequest() {
-		// TODO: pass this as prop to components and refresh whenever we perform updates
-		virtualBranches.refresh();
-	}
 </script>
 
 <div
@@ -62,7 +57,7 @@
 			{virtualBranches}
 		/>
 	{/each}
-	<NewBranchDropZone on:newBranch on:update={handleUpdateRequest} />
+	<NewBranchDropZone {virtualBranches} />
 </div>
 
 <style lang="postcss">
diff --git a/src/routes/projects_new/[projectId]/NewBranchDropZone.svelte b/src/routes/projects_new/[projectId]/NewBranchDropZone.svelte
index 7ba07c265..626abee6a 100644
--- a/src/routes/projects_new/[projectId]/NewBranchDropZone.svelte
+++ b/src/routes/projects_new/[projectId]/NewBranchDropZone.svelte
@@ -3,10 +3,10 @@
 	import { Branch, File, Hunk } from './types';
 	import type { DndEvent } from 'svelte-dnd-action/typings';
 	import { createBranch, createFile } from './helpers';
-	import { createEventDispatcher } from 'svelte';
 	import { Button } from '$lib/components';
+	import type { VirtualBranchStore } from './vbranches';
 
-	const dispatch = createEventDispatcher();
+	export let virtualBranches: VirtualBranchStore;
 	let items: Branch[] = [];
 
 	function handleDndFinalize(e: CustomEvent<DndEvent<Branch | File | Hunk>>) {
@@ -24,8 +24,7 @@
 		}
 
 		if (e.type == 'finalize') {
-			dispatch('newBranch', branchItems);
-			dispatch('update');
+			virtualBranches.createBranch(branchItems[0].name, branchItems[0].files[0].path);
 			items = [];
 			return;
 		}