From 4b3fc14e15f621622106b60c53f8c8259d9aaf62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 9 Sep 2021 11:02:03 +0200
Subject: [PATCH 1/4] :zap: Hide middle container if empty string

---
 packages/editor-ui/src/components/FixedCollectionParameter.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index 272f23d84..d29539e86 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -5,7 +5,8 @@
 		</div>
 
 		<div v-for="property in getProperties" :key="property.name" class="fixed-collection-parameter-property">
-			<div class="parameter-name" :title="property.displayName">{{property.displayName}}:</div>
+			<div v-if="property.displayName === ''"></div>
+			<div v-else class="parameter-name" :title="property.displayName">{{property.displayName}}:</div>
 
 			<div v-if="multipleValues === true">
 				<div v-for="(value, index) in values[property.name]" :key="property.name + index" class="parameter-item">

From 3045c0de1e06974c5f910cbc9193e116819d9119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 9 Sep 2021 11:02:29 +0200
Subject: [PATCH 2/4] :zap: Add first fixed collection option automatically

---
 .../editor-ui/src/components/FixedCollectionParameter.vue    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index d29539e86..d62b8fafb 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -79,6 +79,11 @@ export default mixins(genericHelpers)
 				selectedOption: undefined,
 			};
 		},
+		mounted() {
+			this.$nextTick(function () {
+				this.optionSelected(this.parameter.options[0].name);
+			});
+		},
 		computed: {
 			getPlaceholderText (): string {
 				return this.parameter.placeholder ? this.parameter.placeholder : 'Choose Option To Add';

From 19afcdbcfd56d81ca90e31452f00fa75a0ea493c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 9 Sep 2021 19:32:10 +0200
Subject: [PATCH 3/4] :zap: Prevent excess option addition

---
 .../src/components/FixedCollectionParameter.vue   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index d62b8fafb..86e270e0f 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -5,7 +5,7 @@
 		</div>
 
 		<div v-for="property in getProperties" :key="property.name" class="fixed-collection-parameter-property">
-			<div v-if="property.displayName === ''"></div>
+			<div v-if="property.displayName === '' || parameter.options.length === 1"></div>
 			<div v-else class="parameter-name" :title="property.displayName">{{property.displayName}}:</div>
 
 			<div v-if="multipleValues === true">
@@ -80,9 +80,16 @@ export default mixins(genericHelpers)
 			};
 		},
 		mounted() {
-			this.$nextTick(function () {
-				this.optionSelected(this.parameter.options[0].name);
-			});
+			const sectionKeys = Object.keys(this.values);
+
+			if (
+				sectionKeys.length === 0 ||
+				(sectionKeys.length === 1 && this.values[sectionKeys[0]].length === 0)
+			) {
+				this.$nextTick(function () {
+					this.optionSelected(this.parameter.options[0].name);
+				});
+			}
 		},
 		computed: {
 			getPlaceholderText (): string {

From abb80b4888b6c44df777f9b8142899e86a86ba7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 10 Sep 2021 16:51:54 +0200
Subject: [PATCH 4/4] :zap: Limit auto-expansion to required params only

---
 .../editor-ui/src/components/FixedCollectionParameter.vue    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index 86e270e0f..f77a39bf0 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -83,8 +83,9 @@ export default mixins(genericHelpers)
 			const sectionKeys = Object.keys(this.values);
 
 			if (
-				sectionKeys.length === 0 ||
-				(sectionKeys.length === 1 && this.values[sectionKeys[0]].length === 0)
+				this.parameter.required &&
+				(sectionKeys.length === 0 ||
+				(sectionKeys.length === 1 && this.values[sectionKeys[0]].length === 0))
 			) {
 				this.$nextTick(function () {
 					this.optionSelected(this.parameter.options[0].name);