Make column size facultative + other improvments

Author: PatrickePatate

src/Console/ConfigureCmsCommand.php

@@ -137,12 +137,12 @@ private function updateCmsConfigurationFor($model, int $order = 1, bool $isSubCo
                 'belongsToFilter' => $list->belongsToFilter()?->toArray(),
                 'columns' => $list
                     ->columns()
-                    ->map(fn (OzuColumn $column) => [
+                    ->mapWithKeys(fn (OzuColumn $column) => [$column->key() => [
                         'type' => $column->type(),
                         'key' => $column->key(),
                         'label' => $column->label(),
                         'size' => $column->size(),
-                    ]),
+                    ]]),
             ],
             'form' => [
                 'title' => $form->titleField()?->toArray(),

src/OzuCms/Form/OzuEditorField.php

@@ -83,7 +83,7 @@ public function setCropRatio(string $cropRatio): self
     public function setAllowedExtensions(array $extensions): self
     {
         if (!in_array(OzuEditorToolbarButton::File, $this->toolbar)) {
-            throw new OzuClientException('You should allow uploads by adding OzuEditorToolbarButton::File in toolbar configuration before setting the allowed extensions for uploads');
+            throw new OzuClientException('You should allow uploads by adding OzuEditorToolbarButton::File or OzuEditorToolbarButton::Image in toolbar configuration before setting the allowed extensions for uploads');
         }
 
         // formatting extensions to be compatible with the editor
@@ -101,6 +101,10 @@ public function type(): string
 
     public function toArray(): array
     {
+        if (in_array(OzuEditorToolbarButton::File, $this->toolbar) && empty($this->allowedExtensions)) {
+            throw new OzuClientException('You have to set allowed extensions (via ->setAllowedExtensions()’s method) when using the OzuEditorToolbarButton::File in your toolbar');
+        }
+
         return array_merge(parent::toArray(), [
             'withoutParagraphs' => $this->withoutParagraphs,
             'hideToolbar' => $this->hideToolbar,

src/OzuCms/List/OzuColumn.php

@@ -10,26 +10,29 @@ abstract class OzuColumn
 
     protected string $sortDirection = 'asc';
 
-    protected function __construct(protected string $key, protected int $size)
+    /**
+     * @param  ?int  $size  Accepts no size (will auto-fit), 12-based column size (1-12) or a percentage (e.g. 25)
+     */
+    protected function __construct(protected string $key, protected ?int $size = null)
     {
     }
 
-    public static function makeText(string $key, int $size): OzuTextColumn
+    public static function makeText(string $key, ?int $size = null): OzuTextColumn
     {
         return new OzuTextColumn($key, $size);
     }
 
-    public static function makeDate(string $key, int $size): OzuDateColumn
+    public static function makeDate(string $key, ?int $size = null): OzuDateColumn
     {
         return new OzuDateColumn($key, $size);
     }
 
-    public static function makeImage(string $key, int $size): OzuThumbnailColumn
+    public static function makeImage(string $key, ?int $size = null): OzuThumbnailColumn
     {
         return new OzuThumbnailColumn($key, $size);
     }
 
-    public static function makeCheck(string $key, int $size): OzuCheckColumn
+    public static function makeCheck(string $key, ?int $size = null): OzuCheckColumn
     {
         return new OzuCheckColumn($key, $size);
     }
@@ -39,7 +42,7 @@ public function key(): string
         return $this->key;
     }
 
-    public function size(): int
+    public function size(): ?int
     {
         return $this->size;
     }