From c289d7e1491cce857fde5c017b62b3334a197674 Mon Sep 17 00:00:00 2001 From: Ahmet Bora Date: Sun, 2 Mar 2025 22:58:15 +0300 Subject: [PATCH 1/3] Hide entry label for entries field as default #7039 --- panel/src/components/Forms/Field/EntriesField.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/panel/src/components/Forms/Field/EntriesField.vue b/panel/src/components/Forms/Field/EntriesField.vue index cc79e65ce6..2544293dab 100644 --- a/panel/src/components/Forms/Field/EntriesField.vue +++ b/panel/src/components/Forms/Field/EntriesField.vue @@ -64,6 +64,7 @@ :is="`k-${field.type}-field`" :ref="'entry-' + index + '-input'" :disabled="disabled" + :label="false" :value="entry.value" v-bind="field" class="k-entries-field-item-input" From d61514db2fbc8572a1a077ce2ec5a9c192a6941f Mon Sep 17 00:00:00 2001 From: Ahmet Bora Date: Sun, 2 Mar 2025 23:47:02 +0300 Subject: [PATCH 2/3] Apply code reviews --- panel/src/components/Forms/Field/EntriesField.vue | 2 +- src/Form/Field/EntriesField.php | 3 +++ tests/Form/Field/EntriesFieldTest.php | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/panel/src/components/Forms/Field/EntriesField.vue b/panel/src/components/Forms/Field/EntriesField.vue index 2544293dab..145aa7c866 100644 --- a/panel/src/components/Forms/Field/EntriesField.vue +++ b/panel/src/components/Forms/Field/EntriesField.vue @@ -64,9 +64,9 @@ :is="`k-${field.type}-field`" :ref="'entry-' + index + '-input'" :disabled="disabled" - :label="false" :value="entry.value" v-bind="field" + :label="false" class="k-entries-field-item-input" @input="onInput(index, $event)" /> diff --git a/src/Form/Field/EntriesField.php b/src/Form/Field/EntriesField.php index a9909240fe..0abc3d755f 100644 --- a/src/Form/Field/EntriesField.php +++ b/src/Form/Field/EntriesField.php @@ -93,6 +93,9 @@ protected function setField(array|string|null $attrs = null): void ); } + // remove the label from the entry field + unset($attrs['label']); + $this->field = $attrs; } diff --git a/tests/Form/Field/EntriesFieldTest.php b/tests/Form/Field/EntriesFieldTest.php index 7d025053c1..14fc949b41 100644 --- a/tests/Form/Field/EntriesFieldTest.php +++ b/tests/Form/Field/EntriesFieldTest.php @@ -103,6 +103,18 @@ public function testFieldArrayTwo() $this->assertSame($props, $field->field()); } + public function testFieldLabel() + { + $field = $this->field('entries', [ + 'field' => [ + 'type' => 'text', + 'label' => 'Test' + ] + ]); + + $this->assertArrayNotHasKey('label', $field->field()); + } + public function testDefaultValue() { $field = $this->field('entries', [ From 0b0bc45f9c6fb6c121b3beffd4620dbb01e70b4c Mon Sep 17 00:00:00 2001 From: Ahmet Bora Date: Mon, 3 Mar 2025 11:47:52 +0300 Subject: [PATCH 3/3] Remove the unsupported props from the entry field #7039 --- panel/src/components/Forms/Field/EntriesField.vue | 1 + src/Form/Field/EntriesField.php | 4 ++-- tests/Form/Field/EntriesFieldTest.php | 12 ++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/panel/src/components/Forms/Field/EntriesField.vue b/panel/src/components/Forms/Field/EntriesField.vue index 145aa7c866..4472c6c101 100644 --- a/panel/src/components/Forms/Field/EntriesField.vue +++ b/panel/src/components/Forms/Field/EntriesField.vue @@ -66,6 +66,7 @@ :disabled="disabled" :value="entry.value" v-bind="field" + :counter="false" :label="false" class="k-entries-field-item-input" @input="onInput(index, $event)" diff --git a/src/Form/Field/EntriesField.php b/src/Form/Field/EntriesField.php index 0abc3d755f..aa53e0ff9c 100644 --- a/src/Form/Field/EntriesField.php +++ b/src/Form/Field/EntriesField.php @@ -93,8 +93,8 @@ protected function setField(array|string|null $attrs = null): void ); } - // remove the label from the entry field - unset($attrs['label']); + // remove the unsupported props from the entry field + unset($attrs['counter'], $attrs['label']); $this->field = $attrs; } diff --git a/tests/Form/Field/EntriesFieldTest.php b/tests/Form/Field/EntriesFieldTest.php index 14fc949b41..62ef06f4af 100644 --- a/tests/Form/Field/EntriesFieldTest.php +++ b/tests/Form/Field/EntriesFieldTest.php @@ -115,6 +115,18 @@ public function testFieldLabel() $this->assertArrayNotHasKey('label', $field->field()); } + public function testFieldCounter() + { + $field = $this->field('entries', [ + 'field' => [ + 'type' => 'text', + 'counter' => true + ] + ]); + + $this->assertArrayNotHasKey('counter', $field->field()); + } + public function testDefaultValue() { $field = $this->field('entries', [