From 75b086f12b1493d64f692e0274d684552e281dc5 Mon Sep 17 00:00:00 2001
From: Mattias Granlund <mtsgrd@gmail.com>
Date: Sun, 25 Jun 2023 15:33:20 +0300
Subject: [PATCH] Update branches on commit/new branch

---
 .../projects_new/[projectId]/+page.svelte     |  5 ++-
 src/routes/projects_new/[projectId]/+page.ts  | 22 +---------
 .../projects_new/[projectId]/Board.svelte     | 41 ++++++++++++++++---
 .../[projectId]/BranchLane.svelte             | 29 +++++++------
 .../[projectId]/NewBranchDropZone.svelte      |  1 +
 5 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/src/routes/projects_new/[projectId]/+page.svelte b/src/routes/projects_new/[projectId]/+page.svelte
index 76a2aa5ef..1f6c41c60 100644
--- a/src/routes/projects_new/[projectId]/+page.svelte
+++ b/src/routes/projects_new/[projectId]/+page.svelte
@@ -6,7 +6,8 @@
 	import { invoke } from '@tauri-apps/api';
 
 	export let data: PageData;
-	let { projectId, target, branches, remoteBranches, remoteBranchesData } = data;
+	let { projectId, target, remoteBranches, remoteBranchesData } = data;
+	let branches: Branch[] = [];
 	let targetChoice = 'origin/master'; // prob should check if it exists
 
 	async function setTarget() {
@@ -31,7 +32,7 @@
 {#if target}
 	<div class="flex w-full max-w-full">
 		<Tray bind:branches {target} {projectId} remoteBranches={remoteBranchesData} />
-		<Board {projectId} bind:branches on:newBranch={handleNewBranch} />
+		<Board {projectId} on:newBranch={handleNewBranch} />
 	</div>
 {:else}
 	<div class="m-auto flex flex-col space-y-2">
diff --git a/src/routes/projects_new/[projectId]/+page.ts b/src/routes/projects_new/[projectId]/+page.ts
index 6c78bc229..dbb6049a6 100644
--- a/src/routes/projects_new/[projectId]/+page.ts
+++ b/src/routes/projects_new/[projectId]/+page.ts
@@ -1,12 +1,7 @@
-import { plainToInstance } from 'class-transformer';
-import { Target, Branch, type BranchData } from './types';
+import type { Target, BranchData } from './types';
 import { invoke } from '$lib/ipc';
 import type { PageLoadEvent } from './$types';
 
-async function getVirtualBranches(params: { projectId: string }) {
-	return invoke<Array<Branch>>('list_virtual_branches', params);
-}
-
 async function getRemoteBranches(params: { projectId: string }) {
 	return invoke<Array<string>>('git_remote_branches', params);
 }
@@ -19,15 +14,6 @@ async function getRemoteBranchesData(params: { projectId: string }) {
 	return invoke<Array<BranchData>>('git_remote_branches_data', params);
 }
 
-function sortBranchHunks(branches: Branch[]): Branch[] {
-	for (const branch of branches) {
-		for (const file of branch.files) {
-			file.hunks.sort((a, b) => b.modifiedAt.getTime() - a.modifiedAt.getTime());
-		}
-	}
-	return branches;
-}
-
 function sortBranchData(branchData: BranchData[]): BranchData[] {
 	// sort remote_branches_data by date
 	return branchData.sort((a, b) => b.lastCommitTs - a.lastCommitTs);
@@ -38,11 +24,7 @@ export async function load(e: PageLoadEvent) {
 	const target = await getTargetData({ projectId });
 	const remoteBranches = await getRemoteBranches({ projectId });
 	const remoteBranchesData = sortBranchData(await getRemoteBranchesData({ projectId }));
-	const branches: Branch[] = sortBranchHunks(
-		plainToInstance(Branch, await getVirtualBranches({ projectId }))
-	);
-	console.log(branches);
-	return { projectId, target, remoteBranches, remoteBranchesData, branches };
+	return { projectId, target, remoteBranches, remoteBranchesData };
 }
 
 if (import.meta.vitest) {
diff --git a/src/routes/projects_new/[projectId]/Board.svelte b/src/routes/projects_new/[projectId]/Board.svelte
index 982e1923b..829990526 100644
--- a/src/routes/projects_new/[projectId]/Board.svelte
+++ b/src/routes/projects_new/[projectId]/Board.svelte
@@ -1,17 +1,31 @@
-<script lang="ts">
+<script lang="ts" async="true">
 	import { dndzone } from 'svelte-dnd-action';
 	import Lane from './BranchLane.svelte';
 	import type { DndEvent } from 'svelte-dnd-action/typings';
-	import { createEventDispatcher } from 'svelte';
+	import { createEventDispatcher, onMount } from 'svelte';
 	import NewBranchDropZone from './NewBranchDropZone.svelte';
-	import type { Branch } from './types';
+	import { Branch } from './types';
+	import { plainToInstance } from 'class-transformer';
+	import { invoke } from '$lib/ipc';
 
-	export let branches: Branch[];
 	export let projectId: string;
+	let branches: Branch[] = [];
 
 	const dispatch = createEventDispatcher();
 	const newBranchClass = 'new-branch-active';
 
+	function sortBranchHunks(branches: Branch[]): Branch[] {
+		for (const branch of branches) {
+			for (const file of branch.files) {
+				file.hunks.sort((a, b) => b.modifiedAt.getTime() - a.modifiedAt.getTime());
+			}
+		}
+		return branches;
+	}
+	async function getVirtualBranches(params: { projectId: string }): Promise<Branch[]> {
+		return invoke<Array<Branch>>('list_virtual_branches', params);
+	}
+
 	function handleDndEvent(e: CustomEvent<DndEvent<Branch>>) {
 		branches = e.detail.items.filter((branch) => branch.active);
 		if (e.type == 'finalize') {
@@ -26,6 +40,22 @@
 		}
 		branches = branches;
 	}
+
+	function updateBranches() {
+		getVirtualBranches({ projectId })
+			.then((res) => {
+				branches = sortBranchHunks(plainToInstance(Branch, res));
+			})
+			.catch((e) => console.log(e));
+	}
+
+	function handleUpdateRequest() {
+		updateBranches();
+	}
+
+	onMount(() => {
+		updateBranches();
+	});
 </script>
 
 <div
@@ -50,11 +80,12 @@
 			bind:files
 			{commits}
 			on:empty={handleEmpty}
+			on:update={handleUpdateRequest}
 			{projectId}
 			branchId={id}
 		/>
 	{/each}
-	<NewBranchDropZone on:newBranch />
+	<NewBranchDropZone on:newBranch on:update={handleUpdateRequest} />
 </div>
 
 <style lang="postcss">
diff --git a/src/routes/projects_new/[projectId]/BranchLane.svelte b/src/routes/projects_new/[projectId]/BranchLane.svelte
index 4b667c8bb..2d1cfce9c 100644
--- a/src/routes/projects_new/[projectId]/BranchLane.svelte
+++ b/src/routes/projects_new/[projectId]/BranchLane.svelte
@@ -15,6 +15,8 @@
 	import { getExpandedWithCacheFallback, setExpandedWithCache } from './cache';
 	import { update_await_block_branch } from 'svelte/internal';
 
+	const dispatch = createEventDispatcher();
+
 	export let branchId: string;
 	export let name: string;
 	export let commitMessage: string;
@@ -22,20 +24,20 @@
 	export let commits: Commit[];
 	export let projectId: string;
 
-	let allExpanded: boolean | undefined;
-
 	$: remoteCommits = commits.filter((c) => c.isRemote);
 	$: localCommits = commits.filter((c) => !c.isRemote);
 
+	let allExpanded: boolean | undefined;
 	let descriptionHeight = 0;
 	let textArea: HTMLTextAreaElement;
-	const dispatch = createEventDispatcher();
 
-	const move_files = async (params: { projectId: string; branch: string; paths: Array<string> }) =>
-		invoke<object>('move_virtual_branch_files', params);
+	async function moveFiles(params: { projectId: string; branch: string; paths: Array<string> }) {
+		return invoke<object>('move_virtual_branch_files', params);
+	}
 
-	const commit_branch = async (params: { projectId: string; branch: string; message: string }) =>
-		invoke<object>('commit_virtual_branch', params);
+	async function commitBranch(params: { projectId: string; branch: string; message: string }) {
+		return invoke<object>('commit_virtual_branch', params);
+	}
 
 	const update_branch = async (params: {
 		projectId: string;
@@ -52,7 +54,7 @@
 				branch: branchId,
 				paths: fileItems.map((item) => item.path)
 			});
-			move_files({
+			moveFiles({
 				projectId: projectId,
 				branch: branchId,
 				paths: fileItems.map((item) => item.path)
@@ -90,13 +92,16 @@
 
 	function commit() {
 		console.log('commit', textArea.value, projectId, branchId);
-		commit_branch({
+		commitBranch({
 			projectId: projectId,
 			branch: branchId,
 			message: textArea.value
-		}).then((res) => {
-			console.log(res);
-		});
+		})
+			.then((res) => {
+				console.log(res);
+				dispatch('update');
+			})
+			.catch((e) => console.log(e));
 	}
 
 	onMount(() => {
diff --git a/src/routes/projects_new/[projectId]/NewBranchDropZone.svelte b/src/routes/projects_new/[projectId]/NewBranchDropZone.svelte
index 9915d6874..7ba07c265 100644
--- a/src/routes/projects_new/[projectId]/NewBranchDropZone.svelte
+++ b/src/routes/projects_new/[projectId]/NewBranchDropZone.svelte
@@ -25,6 +25,7 @@
 
 		if (e.type == 'finalize') {
 			dispatch('newBranch', branchItems);
+			dispatch('update');
 			items = [];
 			return;
 		}