Merge branch '3.x' into 4.x

filamentphp · May 21, 2024 · e47df1e · e47df1e
2 parents 3cac711 + 922dc18
commit e47df1e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/packages/actions/resources/lang/en/import.php b/packages/actions/resources/lang/en/import.php
@@ -11,15 +11,21 @@
         'form' => [
 
             'file' => [
+
                 'label' => 'File',
+
                 'placeholder' => 'Upload a CSV file',
+
+                'rules' => [
+                    'duplicate_columns' => '{0} The file must not contain more than one empty column header.|{1,*} The file must not contain duplicate column headers: :columns.',
+                ],
+
             ],
 
             'columns' => [
                 'label' => 'Columns',
                 'placeholder' => 'Select a column',
             ],
-
         ],
 
         'actions' => [

diff --git a/packages/forms/src/Components/Repeater.php b/packages/forms/src/Components/Repeater.php
@@ -1082,7 +1082,6 @@ public function getCachedExistingRecords(): Collection
         if (
             $this->getModelInstance()->relationLoaded($relationshipName) &&
             (! $this->modifyRelationshipQueryUsing)
-
         ) {
             return $this->cachedExistingRecords = $this->getRecord()->getRelationValue($relationshipName)
                 ->when(filled($orderColumn), fn (Collection $records) => $records->sortBy($orderColumn))