From fde1b6eaad7bee3a682defd1d8dcea87a9dc9256 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Thu, 8 Oct 2020 15:01:48 -0400
Subject: [PATCH] Fix TS 4.0 warnings

---
 .../transition/expand/transition-expand-methods.ts          | 4 +++-
 .../routes/data-model/field-detail/field-detail.vue         | 6 +++---
 .../routes/data-model/fields/components/field-select.vue    | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/components/transition/expand/transition-expand-methods.ts b/app/src/components/transition/expand/transition-expand-methods.ts
index 4a4c86ee76..1284f242c1 100644
--- a/app/src/components/transition/expand/transition-expand-methods.ts
+++ b/app/src/components/transition/expand/transition-expand-methods.ts
@@ -2,7 +2,7 @@ import capitalizeFirst from '@/utils/capitalize-first';
 
 interface HTMLExpandElement extends HTMLElement {
 	_parent?: (Node & ParentNode & HTMLElement) | null;
-	_initialStyle: {
+	_initialStyle?: {
 		transition: string;
 		visibility: string;
 		overflow: string;
@@ -28,6 +28,7 @@ export default function (expandedParentClass = '', xAxis = false) {
 
 		enter(el: HTMLExpandElement) {
 			const initialStyle = el._initialStyle;
+			if (!initialStyle) return;
 			const offset = `${el[offsetProperty]}px`;
 
 			el.style.setProperty('transition', 'none', 'important');
@@ -82,6 +83,7 @@ export default function (expandedParentClass = '', xAxis = false) {
 	}
 
 	function resetStyles(el: HTMLExpandElement) {
+		if (!el._initialStyle) return;
 		const size = el._initialStyle[sizeProperty];
 		el.style.overflow = el._initialStyle.overflow;
 		if (size != null) el.style[sizeProperty] = size;
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 a890aa1002..cd39daaf7e 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
@@ -291,21 +291,21 @@ export default defineComponent({
 				}
 
 				await Promise.all(
-					state.newCollections.map((newCollection: Partial<Collection> & { $type: string }) => {
+					state.newCollections.map((newCollection: Partial<Collection> & { $type?: string }) => {
 						delete newCollection.$type;
 						return api.post(`/collections`, newCollection);
 					})
 				);
 
 				await Promise.all(
-					state.newFields.map((newField: Partial<Field> & { $type: string }) => {
+					state.newFields.map((newField: Partial<Field> & { $type?: string }) => {
 						delete newField.$type;
 						return api.post(`/fields/${newField.collection}`, newField);
 					})
 				);
 
 				await Promise.all(
-					state.updateFields.map((updateField: Partial<Field> & { $type: string }) => {
+					state.updateFields.map((updateField: Partial<Field> & { $type?: string }) => {
 						delete updateField.$type;
 						return api.post(`/fields/${updateField.collection}/${updateField.field}`, updateField);
 					})
diff --git a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue
index f2a15bfd4b..0bb97772ed 100644
--- a/app/src/modules/settings/routes/data-model/fields/components/field-select.vue
+++ b/app/src/modules/settings/routes/data-model/fields/components/field-select.vue
@@ -302,7 +302,7 @@ export default defineComponent({
 					...props.field,
 					field: duplicateName.value,
 					collection: duplicateTo.value,
-				};
+				} as Field & { name?: string; meta: { id?: number; sort?: number } };
 
 				if (newField.meta) {
 					delete newField.meta.id;