Migrate to new grid and deprecate company

dravencms · Jan 6, 2018 · a8484eb · a8484eb
1 parent 573836c
commit a8484eb
Show file tree

Hide file tree

Showing 16 changed files with 125 additions and 875 deletions.
diff --git a/src/Dravencms/AdminModule/Components/User/AclOperationGrid/AclOperationGrid.php b/src/Dravencms/AdminModule/Components/User/AclOperationGrid/AclOperationGrid.php
@@ -23,6 +23,7 @@
 
 use Dravencms\Components\BaseControl\BaseControl;
 use Dravencms\Components\BaseGrid\BaseGridFactory;
+use Dravencms\Components\BaseGrid\Grid;
 use Dravencms\Model\User\Entities\AclResource;
 use Dravencms\Model\User\Repository\AclOperationRepository;
 use Kdyby\Doctrine\EntityManager;
@@ -72,53 +73,59 @@ public function __construct(AclResource $aclResource, AclOperationRepository $ac
 
     /**
      * @param $name
-     * @return \Dravencms\Components\BaseGrid
+     * @return Grid
      */
     public function createComponentGrid($name)
     {
+        /** @var Grid $grid */
         $grid = $this->baseGridFactory->create($this, $name);
 
-        $grid->setModel($this->aclOperationRepository->getAclOperationQueryBuilder($this->aclResource));
+        $grid->setDataSource($this->aclOperationRepository->getAclOperationQueryBuilder($this->aclResource));
 
         $grid->addColumnText('name', 'Název')
                 ->setSortable()
-                ->setFilterText()
-                ->setSuggestion();
+                ->setFilterText();
 
         $grid->addColumnText('description', 'Popis')
                 ->setSortable()
-                ->setFilterText()
-                ->setSuggestion();
+                ->setFilterText();
 
         if ($this->presenter->isAllowed('user', 'edit'))
         {
-            $grid->addActionHref('editOperation', 'Upravit')
-                    ->setIcon('pencil');
+            $grid->addAction('editOperation', '')
+                    ->setIcon('pencil')
+                    ->setTitle('Upravit')
+                    ->setClass('btn btn-xs btn-primary');
         }
 
         if ($this->presenter->isAllowed('user', 'delete'))
         {
-            $grid->addActionHref('delete', 'Smazat')
-                    ->setCustomHref(function($row){
-                        return $this->link('delete!', $row->getId());
-                    })
-                    ->setIcon('trash-o')
-                    ->setConfirm(function($item)
-                    {
-                        return array("Opravdu chcete smazat %s ?", $item->getName());
-                    });
-
-
-            $operations = array('delete' => 'Smazat');
-            $grid->setOperation($operations, [$this, 'gridOperationsHandler'])
-                    ->setConfirm('delete', 'Opravu chcete smazat %i oprávění ?');
+            $grid->addAction('delete', '', 'delete!')
+                ->setIcon('trash')
+                ->setTitle('Smazat')
+                ->setClass('btn btn-xs btn-danger ajax')
+                ->setConfirm('Do you really want to delete row %s?', 'name');
+
+            $grid->addGroupAction('Smazat')->onSelect[] = [$this, 'gridGroupActionDelete'];
         }
 
-        $grid->setExport();
+        $grid->addExportCsvFiltered('Csv export (filtered)', 'acl_resource_filtered.csv')
+            ->setTitle('Csv export (filtered)');
+
+        $grid->addExportCsv('Csv export', 'acl_resource_all.csv')
+            ->setTitle('Csv export');
 
         return $grid;
     }
 
+    /**
+     * @param array $ids
+     */
+    public function gridGroupActionDelete(array $ids)
+    {
+        $this->handleDelete($ids);
+    }
+
     /**
      * @param $action
      * @param $ids

diff --git a/src/Dravencms/AdminModule/Components/User/AclResourceGrid/AclResourceGrid.php b/src/Dravencms/AdminModule/Components/User/AclResourceGrid/AclResourceGrid.php
@@ -23,6 +23,7 @@
 
 use Dravencms\Components\BaseControl\BaseControl;
 use Dravencms\Components\BaseGrid\BaseGridFactory;
+use Dravencms\Components\BaseGrid\Grid;
 use Dravencms\Model\User\Repository\AclResourceRepository;
 use Kdyby\Doctrine\EntityManager;
 
@@ -67,72 +68,64 @@ public function __construct(AclResourceRepository $aclResourceRepository, BaseGr
      */
     public function createComponentGrid($name)
     {
+        /** @var Grid $grid */
         $grid = $this->baseGridFactory->create($this, $name);
 
-        $grid->setModel($this->aclResourceRepository->getAclResourceQueryBuilder());
+        $grid->setDataSource($this->aclResourceRepository->getAclResourceQueryBuilder());
 
         $grid->addColumnText('name', 'Název')
                 ->setSortable()
-                ->setFilterText()
-                ->setSuggestion();
+                ->setFilterText();
 
         $grid->addColumnText('description', 'Popis')
                 ->setSortable()
-                ->setFilterText()
-                ->setSuggestion();
+                ->setFilterText();
 
         if ($this->presenter->isAllowed('user', 'edit'))
         {
-            $grid->addActionHref('operation', 'Operace')
-                ->setIcon('lock');
-
-            $grid->addActionHref('edit', 'Upravit')
-                    ->setIcon('pencil');
+            $grid->addAction('operation', 'Operace')
+                ->setIcon('lock')
+                ->setTitle('Operace')
+                ->setClass('btn btn-xs btn-default');
+
+            $grid->addAction('edit', '')
+                    ->setIcon('pencil')
+                    ->setTitle('Upravit')
+                    ->setClass('btn btn-xs btn-primary');
         }
 
         if ($this->presenter->isAllowed('user', 'delete'))
         {
-            $grid->addActionHref('delete', 'Smazat')
-                    ->setCustomHref(function($row){
-                        return $this->link('delete!', $row->getId());
-                    })
-                    ->setDisable(function($row){
-                        return count($row->getAclOperations());
-                    })
-                    ->setIcon('trash-o')
-                    ->setConfirm(function($item)
-                    {
-                        return array("Opravdu chcete smazat %s ?", $item->getName());
-                    });
-
-
-            $operations = array('delete' => 'Smazat');
-            $grid->setOperation($operations, [$this, 'gridOperationsHandler'])
-                    ->setConfirm('delete', 'Opravu chcete smazat %i oprávění ?');
+            $grid->addAction('delete', '', 'delete!')
+                ->setIcon('trash')
+                ->setTitle('Smazat')
+                ->setClass('btn btn-xs btn-danger ajax')
+                ->setConfirm('Do you really want to delete row %s?', 'name');
+
+            $grid->addGroupAction('Smazat')->onSelect[] = [$this, 'gridGroupActionDelete'];
         }
 
-        $grid->setExport();
+        $grid->addExportCsvFiltered('Csv export (filtered)', 'acl_resource_filtered.csv')
+            ->setTitle('Csv export (filtered)');
+
+        $grid->addExportCsv('Csv export', 'acl_resource_all.csv')
+            ->setTitle('Csv export');
 
         return $grid;
     }
 
     /**
-     * @param $action
-     * @param $ids
+     * @param array $ids
      */
-    public function gridOperationsHandler($action, $ids)
+    public function gridGroupActionDelete(array $ids)
     {
-        switch ($action)
-        {
-            case 'delete':
-                $this->handleDelete($ids);
-                break;
-        }
+        $this->handleDelete($ids);
     }
 
     /**
      * @param $id
      * @throws \Exception
+     * @isAllowed(user, delete)
      */
     public function handleDelete($id)
     {

diff --git a/src/Dravencms/AdminModule/Components/User/CompanyForm/CompanyForm.latte b/src/Dravencms/AdminModule/Components/User/CompanyForm/CompanyForm.latte