From 79903caceff9a3ddb205ac2e1f89308ca1fe67b7 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Wed, 5 Aug 2020 13:03:57 -0400
Subject: [PATCH] Remove hacky active state in route modals

---
 app/src/modules/files/routes/add-new/add-new.vue      |  9 ++-------
 .../routes/data-model/field-detail/field-detail.vue   | 11 ++---------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/src/modules/files/routes/add-new/add-new.vue b/app/src/modules/files/routes/add-new/add-new.vue
index 546f78c41f..63b455a0e5 100644
--- a/app/src/modules/files/routes/add-new/add-new.vue
+++ b/app/src/modules/files/routes/add-new/add-new.vue
@@ -1,5 +1,5 @@
 <template>
-	<v-dialog :active="dialogActive" @toggle="close">
+	<v-dialog :active="true" @toggle="close">
 		<v-card>
 			<v-card-title>{{ $t('add_new_file') }}</v-card-title>
 			<v-card-text>
@@ -24,14 +24,9 @@ export default defineComponent({
 		},
 	},
 	setup(props, { emit }) {
-		const dialogActive = ref(false);
-
-		onMounted(() => dialogActive.value = true);
-
-		return { onUpload, close, dialogActive };
+		return { onUpload, close };
 
 		function close() {
-			dialogActive.value = false;
 			router.push('/files');
 		}
 
diff --git a/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue b/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue
index f6d6372d61..937bbe78d0 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/field-detail.vue
@@ -1,6 +1,6 @@
 <template>
 	<v-modal
-		:active="active"
+		:active="true"
 		:title="field === '+' ? $t('creating_new_field') : $t('updating_field_field', { field: existingField.name })"
 		persistent
 	>
@@ -111,13 +111,6 @@ export default defineComponent({
 			return type;
 		});
 
-		// This makes sure we still see the enter animation
-		/** @todo fix this in the transition */
-		const active = ref(false);
-		onMounted(() => {
-			active.value = true;
-		});
-
 		initLocalStore(props.collection, props.field, localType.value);
 
 		const { tabs, currentTab } = useTabs();
@@ -125,7 +118,7 @@ export default defineComponent({
 		const saving = ref(false);
 
 		return {
-			active,
+			// active,
 			tabs,
 			currentTab,
 			fieldData: state.fieldData,