From 37c36560fb4f92567bb0117c0128f3ab3cd7de4c Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 16 Jun 2022 18:11:42 +0200
Subject: [PATCH] fix: task default color should be set and evaluated properly

---
 src/components/tasks/partials/kanban-card.vue | 6 ++++--
 src/models/task.ts                            | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/tasks/partials/kanban-card.vue b/src/components/tasks/partials/kanban-card.vue
index 350fc206d6..7076c5245f 100644
--- a/src/components/tasks/partials/kanban-card.vue
+++ b/src/components/tasks/partials/kanban-card.vue
@@ -4,9 +4,9 @@
 		:class="{
 			'is-loading': loadingInternal || loading,
 			'draggable': !(loadingInternal || loading),
-			'has-light-text': !colorIsDark(task.hexColor) && task.hexColor !== `#${task.defaultColor}` && task.hexColor !== task.defaultColor,
+			'has-light-text': task.getHexColor() !== TASK_DEFAULT_COLOR && !colorIsDark(task.getHexColor()),
 		}"
-		:style="{'background-color': task.hexColor !== '#' && task.hexColor !== `#${task.defaultColor}` ? task.hexColor : false}"
+		:style="{'background-color': task.hexColor !== '#' && task.hexColor !== '' ? task.hexColor : false}"
 		@click.exact="openTaskDetail()"
 		@click.ctrl="() => toggleTaskDone(task)"
 		@click.meta="() => toggleTaskDone(task)"
@@ -74,6 +74,7 @@ import User from '../../../components/misc/user'
 import Done from '@/components/misc/Done.vue'
 import Labels from '../../../components/tasks/partials/labels'
 import ChecklistSummary from './checklist-summary'
+import {TASK_DEFAULT_COLOR} from '@/models/task'
 
 import {colorIsDark} from '@/helpers/color/colorIsDark'
 
@@ -89,6 +90,7 @@ export default defineComponent({
 	data() {
 		return {
 			loadingInternal: false,
+			TASK_DEFAULT_COLOR,
 		}
 	},
 	props: {
diff --git a/src/models/task.ts b/src/models/task.ts
index 537a0e22e0..e9146e7d36 100644
--- a/src/models/task.ts
+++ b/src/models/task.ts
@@ -8,6 +8,7 @@ import SubscriptionModel from '@/models/subscription'
 import {parseDateOrNull} from '@/helpers/parseDateOrNull'
 
 const SUPPORTS_TRIGGERED_NOTIFICATION = 'Notification' in window && 'showTrigger' in Notification.prototype
+export const TASK_DEFAULT_COLOR = '#1973ff'
 
 export default class TaskModel extends AbstractModel {
 	constructor(data) {
@@ -187,8 +188,8 @@ export default class TaskModel extends AbstractModel {
 	}
 
 	getHexColor() {
-		if (this.hexColor === '') {
-			return `#${this.defaultColor}`
+		if (this.hexColor === '' || this.hexColor === '#') {
+			return TASK_DEFAULT_COLOR
 		}
 
 		return this.hexColor