From 9d385451796fb255d59b55658680db1d135272f9 Mon Sep 17 00:00:00 2001
From: Bhasher <github.it@bhasher.com>
Date: Tue, 2 Jan 2024 22:33:09 +0100
Subject: [PATCH] Fix tag deletion and views update

---
 .../card/modal_tag/modal_tag_value.svelte     | 16 ++++++++------
 .../project/card/modal_tag/select_tags.svelte |  4 ++++
 frontend/src/components/project/header.svelte | 12 +++++++---
 frontend/src/components/sidebar.svelte        |  5 +++--
 frontend/src/stores/smallStore.ts             | 22 +++++++++----------
 5 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/frontend/src/components/project/card/modal_tag/modal_tag_value.svelte b/frontend/src/components/project/card/modal_tag/modal_tag_value.svelte
index 1162394..d3ee6c2 100644
--- a/frontend/src/components/project/card/modal_tag/modal_tag_value.svelte
+++ b/frontend/src/components/project/card/modal_tag/modal_tag_value.svelte
@@ -10,10 +10,12 @@
 	let tagType = getTagTypeFromId(projectTag.type);
 </script>
 
-<td>
-	{#if tagType?.hasOptions}
-		<SelectTags multiple={false} {projectTag} {card} bind:tagValue />
-	{:else if !tagType?.hasOptions}
-		<input />
-	{/if}
-</td>
+{#if tagType}
+	<td>
+		{#if tagType?.hasOptions}
+			<SelectTags multiple={false} {projectTag} {card} bind:tagValue />
+		{:else if !tagType?.hasOptions}
+			<input />
+		{/if}
+	</td>
+{/if}
diff --git a/frontend/src/components/project/card/modal_tag/select_tags.svelte b/frontend/src/components/project/card/modal_tag/select_tags.svelte
index bc44559..a9b0c95 100644
--- a/frontend/src/components/project/card/modal_tag/select_tags.svelte
+++ b/frontend/src/components/project/card/modal_tag/select_tags.svelte
@@ -79,6 +79,10 @@
 		}
 
 		tagValue = undefined;
+
+		card.tags = card.tags.filter((t) => t.tag_id !== projectTag.id);
+
+		cards.reload();
 	}
 
 	function createOption() {
diff --git a/frontend/src/components/project/header.svelte b/frontend/src/components/project/header.svelte
index b873caf..387a52c 100644
--- a/frontend/src/components/project/header.svelte
+++ b/frontend/src/components/project/header.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { get } from 'svelte/store';
 	import type { Project, TagValue, View } from '../../stores/interfaces';
-	import { cards, currentView } from '../../stores/smallStore';
+	import { cards, currentView, views } from '../../stores/smallStore';
 	import projectTags from '../../stores/projectTags';
 	import GroupMenu from './groupMenu.svelte';
 
@@ -25,10 +25,16 @@
 	async function setGroup(id: number): Promise<boolean> {
 		if ($currentView == null) return false;
 
-		return await currentView.update({
+		const view = {
 			...$currentView,
 			primary_tag_id: id
-		});
+		};
+
+		const res = await views.edit(view);
+
+		if (res) currentView.set(view);
+
+		return res;
 	}
 </script>
 
diff --git a/frontend/src/components/sidebar.svelte b/frontend/src/components/sidebar.svelte
index 7ae4a57..26d8ad4 100644
--- a/frontend/src/components/sidebar.svelte
+++ b/frontend/src/components/sidebar.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { onMount } from 'svelte';
+	import { onMount, tick } from 'svelte';
 	import api, { processError } from '../utils/api';
 	import type { Project, View } from '../stores/interfaces';
 	import { currentView, views } from '../stores/smallStore';
@@ -35,9 +35,10 @@
 	}
 
 	async function saveView(view: View) {
+		await tick();
 		if (!view || !$views.includes(view)) return;
 		if (viewEditId === view.id && viewEditValue !== view.title) {
-			if (!(await views.update(view))) return;
+			if (!(await views.edit(view))) return;
 		}
 
 		viewEditId = -1;
diff --git a/frontend/src/stores/smallStore.ts b/frontend/src/stores/smallStore.ts
index a3a51a3..dbf8a12 100644
--- a/frontend/src/stores/smallStore.ts
+++ b/frontend/src/stores/smallStore.ts
@@ -10,19 +10,19 @@ export const currentView = (() => {
 
 	return {
 		subscribe,
-		set,
-		update: async (view: View): Promise<boolean> => {
-			const response = await api.put(`/v1/views/${view.id}`, view);
+		set
+		// update: async (view: View): Promise<boolean> => {
+		// 	const response = await api.put(`/v1/views/${view.id}`, view);
 
-			if (response.status !== status.NoContent) {
-				processError(response, 'Failed to update view');
-				return false;
-			}
+		// 	if (response.status !== status.NoContent) {
+		// 		processError(response, 'Failed to update view');
+		// 		return false;
+		// 	}
 
-			set(view);
+		// 	set(view);
 
-			return true;
-		}
+		// 	return true;
+		// }
 	};
 })();
 
@@ -136,6 +136,6 @@ export const views = (() => {
 		init,
 		add,
 		remove,
-		update: edit
+		edit
 	};
 })();