From 39bdb86fadd3287369ca71df287889cd89ffd25b Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Wed, 5 Aug 2020 10:55:22 -0400
Subject: [PATCH 1/2] Fix v-checkbox blowout on relational setup

---
 .../data-model/field-detail/components/relationship-m2m.vue     | 2 +-
 .../data-model/field-detail/components/relationship-m2o.vue     | 2 +-
 .../data-model/field-detail/components/relationship-o2m.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2m.vue b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2m.vue
index aca183a806..17e2702ceb 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2m.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2m.vue
@@ -104,7 +104,7 @@ export default defineComponent({
 
 	position: relative;
 	display: grid;
-	grid-template-columns: repeat(3, 1fr);
+	grid-template-columns: repeat(3, minmax(0, 1fr));
 	gap: 20px;
 	margin-top: 48px;
 
diff --git a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2o.vue b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2o.vue
index 88936c995d..71ce3b3496 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2o.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2o.vue
@@ -170,7 +170,7 @@ export default defineComponent({
 
 	position: relative;
 	display: grid;
-	grid-template-columns: repeat(2, 1fr);
+	grid-template-columns: repeat(2, minmax(0, 1fr));
 	gap: 20px 32px;
 	margin-top: 48px;
 
diff --git a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-o2m.vue b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-o2m.vue
index 3bb1257d2e..1ebdf8ebaf 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-o2m.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-o2m.vue
@@ -114,7 +114,7 @@ export default defineComponent({
 .grid {
 	position: relative;
 	display: grid;
-	grid-template-columns: repeat(2, 1fr);
+	grid-template-columns: repeat(2, minmax(0, 1fr));
 	gap: 20px 32px;
 	margin-top: 48px;
 

From 4d4df85c2d414b4db2f7d2f9324f8407d72d3e07 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Wed, 5 Aug 2020 10:55:29 -0400
Subject: [PATCH 2/2] Refresh relations state on field creation

---
 .../settings/routes/data-model/field-detail/field-detail.vue     | 1 +
 1 file changed, 1 insertion(+)

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 42e04aa9cc..f6d6372d61 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
@@ -234,6 +234,7 @@ export default defineComponent({
 				);
 
 				await fieldsStore.hydrate();
+				await relationsStore.hydrate();
 				router.push(`/settings/data-model/${props.collection}`);
 				clearLocalStore();
 			} catch (error) {