From 646743cf0f7aa9e862c9ca5546bb8dcdccb7fc34 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 3 Jul 2020 16:41:43 -0400
Subject: [PATCH] Various more tweaks to run it on node

---
 src/directives/click-outside/click-outside.story.ts | 1 -
 src/displays/datetime/datetime.vue                  | 5 +++--
 src/modules/files/routes/browse/browse.vue          | 2 +-
 src/modules/users/routes/browse/browse.vue          | 2 +-
 src/utils/get-local-type/get-local-type.ts          | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/directives/click-outside/click-outside.story.ts b/src/directives/click-outside/click-outside.story.ts
index ede82c7fa5..e3e3d69516 100644
--- a/src/directives/click-outside/click-outside.story.ts
+++ b/src/directives/click-outside/click-outside.story.ts
@@ -72,7 +72,6 @@ export const withMiddleware = () =>
 			return { count, middleware };
 
 			function middleware(event: any) {
-				console.log(!!event.target.dataset);
 				return event.target.classList.contains('prevent') === false;
 			}
 		},
diff --git a/src/displays/datetime/datetime.vue b/src/displays/datetime/datetime.vue
index b306205ced..1756c9a5f1 100644
--- a/src/displays/datetime/datetime.vue
+++ b/src/displays/datetime/datetime.vue
@@ -18,7 +18,7 @@ export default defineComponent({
 		type: {
 			type: String as PropType<'datetime' | 'time' | 'date'>,
 			required: true,
-			validator: (val: string) => ['datetime', 'date', 'time'].includes(val),
+			validator: (val: string) => ['datetime', 'date', 'time', 'timestamp'].includes(val),
 		},
 	},
 	setup(props) {
@@ -45,7 +45,8 @@ export default defineComponent({
 				if (props.type === 'time') format = String(i18n.t('date-fns_time'));
 
 				displayValue.value = await formatLocalized(date, format);
-			}
+			},
+			{ immediate: true }
 		);
 
 		return { displayValue };
diff --git a/src/modules/files/routes/browse/browse.vue b/src/modules/files/routes/browse/browse.vue
index 84ce23f6d9..dc7f239f15 100644
--- a/src/modules/files/routes/browse/browse.vue
+++ b/src/modules/files/routes/browse/browse.vue
@@ -85,7 +85,7 @@
 			:filters="filtersWithFolderAndType"
 			:search-query="searchQuery"
 			@update:filters="filters = $event"
-			:detail-route="'/{{project}}/files/{{primaryKey}}'"
+			:detail-route="'/files/{{primaryKey}}'"
 		/>
 
 		<template #drawer>
diff --git a/src/modules/users/routes/browse/browse.vue b/src/modules/users/routes/browse/browse.vue
index 8d033f3c76..032d211acb 100644
--- a/src/modules/users/routes/browse/browse.vue
+++ b/src/modules/users/routes/browse/browse.vue
@@ -55,7 +55,7 @@
 			:selection.sync="selection"
 			:view-options.sync="viewOptions"
 			:view-query.sync="viewQuery"
-			:detail-route="'/{{project}}/users/{{item.role}}/{{primaryKey}}'"
+			:detail-route="'/users/{{item.role}}/{{primaryKey}}'"
 			:filters="_filters"
 			:search-query="searchQuery"
 			@update:filters="filters = $event"
diff --git a/src/utils/get-local-type/get-local-type.ts b/src/utils/get-local-type/get-local-type.ts
index 9ab24f593c..7129c8500f 100644
--- a/src/utils/get-local-type/get-local-type.ts
+++ b/src/utils/get-local-type/get-local-type.ts
@@ -70,7 +70,7 @@ const localTypeMap: Record<string, { type: Type; useTimezone?: boolean }> = {
 	bpchar: { type: 'string' },
 	timestamptz: { type: 'timestamp' },
 	'timestamp with time zone': { type: 'timestamp', useTimezone: true },
-	'timestamp without thime zone': { type: 'timestamp' },
+	'timestamp without time zone': { type: 'timestamp' },
 	timetz: { type: 'time' },
 	'time with time zone': { type: 'time', useTimezone: true },
 	'time without time zone': { type: 'time' },
@@ -79,7 +79,7 @@ const localTypeMap: Record<string, { type: Type; useTimezone?: boolean }> = {
 };
 
 export default function getLocalType(databaseType: string): Type {
-	const type = localTypeMap[databaseType];
+	const type = localTypeMap[databaseType.toLowerCase()];
 
 	if (type) {
 		return type.type;