Merge branch 'Majkie-feature/checked-column-selection' into develop

Author: rappasoft

src/Traits/WithColumnSelect.php

@@ -11,17 +11,34 @@ trait WithColumnSelect
 {
     public bool $columnSelect = false;
     public array $columnSelectEnabled = [];
+    public bool $usesSelect = false;
+    public bool $rememberColumnSelection = true;
 
     public function mountWithColumnSelect(): void
     {
+        if (! $this->rememberColumnSelection) {
+            $this->forgetColumnSelectSession();
+        }
+
         // If the column select is off, make sure to clear the session
         if (! $this->columnSelect && session()->has($this->getColumnSelectSessionKey())) {
             session()->forget($this->getColumnSelectSessionKey());
         }
 
+        // If any of the columns are user selected
+        if (collect($this->columns())->filter(fn ($column) => $column->isSelected())->count() > 0) {
+            $this->usesSelect = true;
+        }
+
         // Get a list of visible default columns that are not excluded
         $columns = collect($this->columns())
-            ->filter(fn ($column) => $column->isVisible() && $column->isSelectable())
+            ->filter(function ($column) {
+                if ($this->usesSelect) {
+                    return $column->isVisible() && $column->isSelectable() && $column->isSelected();
+                }
+
+                return $column->isVisible() && $column->isSelectable();
+            })
             ->map(fn ($column) => $column->column())
             ->values()
             ->toArray();
@@ -48,6 +65,11 @@ public function isColumnSelectEnabled($column): bool
         return in_array($column instanceof Column ? $column->column() : $column, $this->columnSelectEnabled, true);
     }
 
+    private function forgetColumnSelectSession(): void
+    {
+        session()->forget($this->getColumnSelectSessionKey());
+    }
+
     private function getColumnSelectSessionKey(): string
     {
         return $this->tableName.'-columnSelectEnabled';

src/Views/Column.php

@@ -74,6 +74,11 @@ class Column
      */
     public bool $selectable = true;
 
+    /**
+     * @var bool
+     */
+    public bool $selected = false;
+
     /**
      * Column constructor.
      *
@@ -335,4 +340,22 @@ public function isSelectable(): bool
     {
         return $this->selectable === true;
     }
+
+    /**
+     * @return $this
+     */
+    public function selected(): self
+    {
+        $this->selected = true;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isSelected(): bool
+    {
+        return $this->selected;
+    }
 }