From 53c56be3df89c6beb4cf284809b32668af2f36f5 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 24 Jul 2020 14:40:38 -0400
Subject: [PATCH] Fix width on fields management page

---
 .../fields/components/field-select/field-select.vue    | 10 +++++-----
 src/stores/fields/fields.ts                            |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/settings/routes/data-model/fields/components/field-select/field-select.vue b/src/modules/settings/routes/data-model/fields/components/field-select/field-select.vue
index 54eb3283cc..e0996dde3b 100644
--- a/src/modules/settings/routes/data-model/fields/components/field-select/field-select.vue
+++ b/src/modules/settings/routes/data-model/fields/components/field-select/field-select.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="hidden ? 'half' : field.width">
+	<div :class="hidden ? 'half' : field.system.width">
 		<v-menu attached close-on-content-click>
 			<template #activator="{ toggle, active }">
 				<v-input class="field" :class="{ hidden, active }" readonly @click="toggle">
@@ -35,15 +35,15 @@
 					<v-list-item-content>{{ $t('duplicate_field') }}</v-list-item-content>
 				</v-list-item>
 				<v-divider />
-				<v-list-item @click="setWidth('half')" :disabled="hidden || field.width === 'half'">
+				<v-list-item @click="setWidth('half')" :disabled="hidden || field.system.width === 'half'">
 					<v-list-item-icon><v-icon name="border_vertical" /></v-list-item-icon>
 					<v-list-item-content>{{ $t('half_width') }}</v-list-item-content>
 				</v-list-item>
-				<v-list-item @click="setWidth('full')" :disabled="hidden || field.width === 'full'">
+				<v-list-item @click="setWidth('full')" :disabled="hidden || field.system.width === 'full'">
 					<v-list-item-icon><v-icon name="border_right" /></v-list-item-icon>
 					<v-list-item-content>{{ $t('full_width') }}</v-list-item-content>
 				</v-list-item>
-				<v-list-item @click="setWidth('fill')" :disabled="hidden || field.width === 'fill'">
+				<v-list-item @click="setWidth('fill')" :disabled="hidden || field.system.width === 'fill'">
 					<v-list-item-icon><v-icon name="aspect_ratio" /></v-list-item-icon>
 					<v-list-item-content>{{ $t('fill_width') }}</v-list-item-content>
 				</v-list-item>
@@ -147,7 +147,7 @@ export default defineComponent({
 		};
 
 		function setWidth(width: string) {
-			fieldsStore.updateField(props.field.collection, props.field.field, { width });
+			fieldsStore.updateField(props.field.collection, props.field.field, { system: { width } });
 		}
 
 		function useDeleteField() {
diff --git a/src/stores/fields/fields.ts b/src/stores/fields/fields.ts
index 3ae70e781b..aa047623f5 100644
--- a/src/stores/fields/fields.ts
+++ b/src/stores/fields/fields.ts
@@ -125,7 +125,7 @@ export const useFieldsStore = createStore({
 
 				this.state.fields = this.state.fields.map((field) => {
 					if (field.collection === collectionKey && field.field === newField.field) {
-						return this.addTranslationsForField(response.data.data);
+						return this.parseField(response.data.data);
 					}
 
 					return field;
@@ -168,7 +168,7 @@ export const useFieldsStore = createStore({
 
 				this.state.fields = this.state.fields.map((field) => {
 					if (field.collection === collectionKey && field.field === fieldKey) {
-						return this.addTranslationsForField(response.data.data);
+						return this.parseField(response.data.data);
 					}
 
 					return field;
@@ -218,7 +218,7 @@ export const useFieldsStore = createStore({
 						const newDataForField = response.data.data.find(
 							(update: Field) => update.field === field.field
 						);
-						if (newDataForField) return this.addTranslationsForField(newDataForField);
+						if (newDataForField) return this.parseField(newDataForField);
 					}
 
 					return field;