Fix issue with pagination in bookmark grid

Author: jissereitsma

Component/Form/FormViewModel.php

@@ -88,7 +88,8 @@ public function getButtons(): array
         return [
             $this->buttonFactory->createCloseAction(),
             $this->buttonFactory->createSaveCloseAction(),
-            //$this->buttonFactory->createSaveContinueAction(), // @todo: This looses current changes when creating a new item
+            // @todo: This looses current changes when creating a new item
+            //$this->buttonFactory->createSaveContinueAction(),
         ];
     }
 

Component/Grid/GridViewModel.php

@@ -150,12 +150,20 @@ public function getJsComponentName(): ?string
 
     public function getJsData(): array
     {
+        $columns = $this->getColumns();
+        $stateData = $this->getState()->toArray();
+        if (empty($stateData['activeColumns'])) {
+            foreach ($columns as $column) {
+                $stateData['activeColumns'][] = $column->getCode();
+            }
+        }
+
         return [
             ...parent::getJsData(),
-            ...$this->getState()->toArray(),
+            ...$stateData,
             'namespace' => $this->getNamespace(),
             'gridFilters' => $this->getGridFilterStateValues(),
-            'columns' => $this->getColumns(),
+            'columns' => $columns,
             'columnPositions' => $this->getColumnPositions(),
             'newUrl' => $this->getNewUrl(),
             'indexUrl' => $this->getIndexUrl(),