From 89c81ae854bc6de83619e9f0aaf5774aeaa3ab97 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Sun, 24 Apr 2022 17:06:00 +0200
Subject: [PATCH] fix: subscription works correctly again

---
 src/components/list/list-settings-dropdown.vue           | 9 +++------
 src/components/misc/subscription.vue                     | 5 +++--
 src/components/namespace/namespace-settings-dropdown.vue | 1 -
 src/views/tasks/TaskDetailView.vue                       | 1 -
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/list/list-settings-dropdown.vue b/src/components/list/list-settings-dropdown.vue
index b8a9082b9..ea1fb9aa7 100644
--- a/src/components/list/list-settings-dropdown.vue
+++ b/src/components/list/list-settings-dropdown.vue
@@ -56,12 +56,11 @@
 				{{ $t('menu.archive') }}
 			</dropdown-item>
 			<task-subscription
-				v-if="subscription"
 				class="dropdown-item has-no-shadow"
 				:is-button="false"
 				entity="list"
 				:entity-id="list.id"
-				:subscription="subscription"
+				:subscription="list.subscription"
 				@change="sub => subscription = sub"
 			/>
 			<dropdown-item
@@ -93,11 +92,9 @@ const props = defineProps({
 	},
 })
 
-const subscription = ref<SubscriptionModel>()
+const subscription = ref<SubscriptionModel | null>(null)
 watchEffect(() => {
-	if (props.list.subscription) {
-		subscription.value = props.list.subscription
-	}
+	subscription.value = props.list.subscription ?? null
 })
 
 const store = useStore()
diff --git a/src/components/misc/subscription.vue b/src/components/misc/subscription.vue
index dbda373ea..81fb910ed 100644
--- a/src/components/misc/subscription.vue
+++ b/src/components/misc/subscription.vue
@@ -36,15 +36,16 @@ import {success} from '@/message'
 interface Props {
   entity: string
   entityId: number
-  subscription: SubscriptionModel
+  subscription: SubscriptionModel | null
   isButton?: boolean
 }
 
 const props = withDefaults(defineProps<Props>(), {
 	isButton: true,
+	subscription: null,
 })
 
-const subscriptionEntity = computed<string>(() => props.subscription.entity)
+const subscriptionEntity = computed<string | null>(() => props.subscription?.entity ?? null)
 
 const emit = defineEmits(['change'])
 
diff --git a/src/components/namespace/namespace-settings-dropdown.vue b/src/components/namespace/namespace-settings-dropdown.vue
index 3359fed95..9651c5b2c 100644
--- a/src/components/namespace/namespace-settings-dropdown.vue
+++ b/src/components/namespace/namespace-settings-dropdown.vue
@@ -34,7 +34,6 @@
 				{{ $t('menu.archive') }}
 			</dropdown-item>
 			<task-subscription
-				v-if="subscription"
 				class="dropdown-item has-no-shadow"
 				:is-button="false"
 				entity="namespace"
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index 96a5536fc..f6e733025 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -264,7 +264,6 @@
 							{{ task.done ? $t('task.detail.undone') : $t('task.detail.done') }}
 						</x-button>
 						<task-subscription
-							v-if="task.subscription"
 							entity="task"
 							:entity-id="task.id"
 							:subscription="task.subscription"