From 3c505670edd106917e3707fadb19513335775361 Mon Sep 17 00:00:00 2001
From: Bhasher <github.it@bhasher.com>
Date: Tue, 9 Jan 2024 02:26:44 +0100
Subject: [PATCH] Fix modalTags

---
 frontend/src/lib/components/card/Card.svelte       | 6 ++----
 frontend/src/lib/components/project/Column.svelte  | 2 +-
 frontend/src/lib/components/tags/SelectTags.svelte | 9 +++------
 frontend/src/lib/types/Card.ts                     | 2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/frontend/src/lib/components/card/Card.svelte b/frontend/src/lib/components/card/Card.svelte
index edf0529..fc572ad 100644
--- a/frontend/src/lib/components/card/Card.svelte
+++ b/frontend/src/lib/components/card/Card.svelte
@@ -20,13 +20,11 @@
 		}
 	}}
 >
-	<div class="title">{card.id} - {card.title}</div>
+	<div class="title">{card.title}</div>
 	<div class="tags">
 		{#each card.cardTags as tag}
 			{#if tag.option}
-				<span class="tag" style="border: 1px solid #333"
-					>{tag.projectTag.id}: {tag.option.id} ({tag.option.value})</span
-				>
+				<span class="tag" style="border: 1px solid #333">{tag.option.value}</span>
 			{:else if tag.value}
 				<span class="tag" style="border: 1px solid #333">{tag.value}</span>
 			{/if}
diff --git a/frontend/src/lib/components/project/Column.svelte b/frontend/src/lib/components/project/Column.svelte
index acfea67..db53358 100644
--- a/frontend/src/lib/components/project/Column.svelte
+++ b/frontend/src/lib/components/project/Column.svelte
@@ -28,7 +28,7 @@
 			await $currentDraggedCard.addTag(primaryTag, option, null);
 		} else if (currentOption && !option) {
 			if (!currentCardTag) return;
-			await $currentDraggedCard.removeTag(currentCardTag);
+			await $currentDraggedCard.deleteTag(currentCardTag);
 		} else if (currentOption && option) {
 			if (!currentCardTag) return;
 			await $currentDraggedCard.updateTag(currentCardTag, option, null);
diff --git a/frontend/src/lib/components/tags/SelectTags.svelte b/frontend/src/lib/components/tags/SelectTags.svelte
index 6aef5e5..1451463 100644
--- a/frontend/src/lib/components/tags/SelectTags.svelte
+++ b/frontend/src/lib/components/tags/SelectTags.svelte
@@ -5,8 +5,6 @@
 	import CardTag from '$lib/types/CardTag';
 	import type ProjectTag from '$lib/types/ProjectTag';
 	import type TagOption from '$lib/types/TagOption';
-	import api, { processError } from '$lib/utils/api';
-	import status from '$lib/utils/status';
 	import TrashIcon from '../icons/TrashIcon.svelte';
 
 	export const multiple: boolean = false;
@@ -25,12 +23,11 @@
 
 		if (cardTag) {
 			if (option) await cardTag.update(option, null);
-			else await cardTag.delete();
+			else await card.deleteTag(cardTag);
 		} else {
-			if (option) await CardTag.create(card, projectTag, option, null);
+			if (option) await card.addTag(projectTag, option, null);
 		}
 		isOpen = false;
-
 		cards.reload();
 	}
 
@@ -55,7 +52,7 @@
 	<div class="tags">
 		{#if cardTag}
 			<span class="tag">
-				{cardTag.value}
+				{cardTag.option?.value}
 				<button class="real" on:click={() => selectOption(null)}>✗</button>
 			</span>
 		{/if}
diff --git a/frontend/src/lib/types/Card.ts b/frontend/src/lib/types/Card.ts
index e779872..6db7f16 100644
--- a/frontend/src/lib/types/Card.ts
+++ b/frontend/src/lib/types/Card.ts
@@ -102,7 +102,7 @@ export default class Card {
 		return true;
 	}
 
-	async removeTag(cardTag: CardTag): Promise<boolean> {
+	async deleteTag(cardTag: CardTag): Promise<boolean> {
 		const res = await cardTag.delete();
 
 		if (!res) return false;