fix Duplicate query #60

Power-Components · Sep 5, 2021 · 102deca · 102deca
1 parent 994b2b7
commit 102deca
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/PowerGridComponent.php b/src/PowerGridComponent.php
@@ -237,11 +237,11 @@ public function eventInputChanged(array $data): void
         $update = $this->update($data);
 
         if (!$update) {
-            session()->flash('error', $this->updateMessages('error', $data['field']));
+            session()->flash('error', $this->updateMessages('error', data_get($data, 'field')));
 
             return;
         }
-        session()->flash('success', $this->updateMessages('success', $data['field']));
+        session()->flash('success', $this->updateMessages('success', data_get($data, 'field')));
 
         if (!is_array($this->dataSource)) {
             return;
@@ -297,7 +297,7 @@ private function loadData()
 
         if ($this->isCollection) {
             $filters = Collection::query($this->resolveCollection($dataSource))
-                ->setColumns($this->columns())
+                ->setColumns($this->columns)
                 ->setSearch($this->search)
                 ->setFilters($this->filters)
                 ->filterContains()
@@ -318,7 +318,7 @@ private function loadData()
         $results = $this->resolveModel($dataSource)
             ->where(function ($query) {
                 Model::query($query)
-                    ->setColumns($this->columns())
+                    ->setColumns($this->columns)
                     ->setSearch($this->search)
                     ->setRelationSearch($this->relationSearch())
                     ->setFilters($this->filters)
@@ -370,8 +370,8 @@ private function transform($results)
     public function toggleColumn($field): void
     {
         $this->columns = collect($this->columns)->map(function ($column) use ($field) {
-            if ($column['field'] === $field) {
-                $column['hidden'] = !$column['hidden'];
+            if (data_get($column, 'field') === $field) {
+                $column['hidden'] = !data_get($column, 'hidden');
             }
 
             return (object)$column;