From fb755efc4e39b75b52215db8d55617427fb8da2d Mon Sep 17 00:00:00 2001
From: Nitwel <nitwel@arcor.de>
Date: Wed, 21 Oct 2020 09:51:34 +0200
Subject: [PATCH] fix ts errors

---
 app/src/modules/settings/routes/roles/item/item.vue | 2 +-
 app/src/modules/settings/routes/webhooks/item.vue   | 2 +-
 app/src/modules/users/routes/item.vue               | 2 +-
 app/src/utils/is-allowed.ts                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/modules/settings/routes/roles/item/item.vue b/app/src/modules/settings/routes/roles/item/item.vue
index a4f6cda2ad..026c34d844 100644
--- a/app/src/modules/settings/routes/roles/item/item.vue
+++ b/app/src/modules/settings/routes/roles/item/item.vue
@@ -124,7 +124,7 @@ export default defineComponent({
 			const values = {
 				...item.value,
 				...edits.value,
-			};
+			} as Record<string, any>;
 
 			return !!values.admin_access;
 		});
diff --git a/app/src/modules/settings/routes/webhooks/item.vue b/app/src/modules/settings/routes/webhooks/item.vue
index bbcb6bd156..5744bb66c0 100644
--- a/app/src/modules/settings/routes/webhooks/item.vue
+++ b/app/src/modules/settings/routes/webhooks/item.vue
@@ -115,7 +115,7 @@ export default defineComponent({
 		const title = computed(() => {
 			if (loading.value) return i18n.t('loading');
 			if (isNew.value) return i18n.t('creating_webhook');
-			return item.value.name;
+			return item.value?.name;
 		});
 
 		return {
diff --git a/app/src/modules/users/routes/item.vue b/app/src/modules/users/routes/item.vue
index 9c44f53655..24c42cd262 100644
--- a/app/src/modules/users/routes/item.vue
+++ b/app/src/modules/users/routes/item.vue
@@ -384,7 +384,7 @@ export default defineComponent({
 		}
 
 		async function refreshCurrentUser() {
-			if (userStore.state.currentUser!.id === item.value.id) {
+			if (userStore.state.currentUser!.id === item.value?.id) {
 				await userStore.hydrate();
 			}
 		}
diff --git a/app/src/utils/is-allowed.ts b/app/src/utils/is-allowed.ts
index 904b10c379..6555154264 100644
--- a/app/src/utils/is-allowed.ts
+++ b/app/src/utils/is-allowed.ts
@@ -2,7 +2,7 @@ import { usePermissionsStore, useUserStore } from '@/stores';
 import { Permission } from '@/types';
 import generateJoi from '@/utils/generate-joi';
 
-export function isAllowed(collection: string, action: Permission['action'], value: Record<string, any>) {
+export function isAllowed(collection: string, action: Permission['action'], value: Record<string, any> | null) {
 	const permissionsStore = usePermissionsStore();
 	const userStore = useUserStore();