moved settings feature logic in its own module

Signed-off-by: MarioRadu <magda_marior@yahoo.com>

Author: marioradu05

src/Admin/src/Handler/Admin/GetAdminListHandler.php

@@ -10,7 +10,6 @@
 use Admin\App\Common\ServerRequestAwareTrait;
 use Admin\App\Pagination;
 use Admin\Setting\Entity\Setting;
-use Admin\Setting\Service\SettingService;
 use Dot\DependencyInjection\Attribute\Inject;
 use Laminas\Authentication\AuthenticationServiceInterface;
 use Laminas\Diactoros\Response\HtmlResponse;
@@ -30,15 +29,13 @@ class GetAdminListHandler implements RequestHandlerInterface
         TemplateRendererInterface::class,
         AuthenticationServiceInterface::class,
         AdminForm::class,
-        SettingService::class,
     )]
     public function __construct(
         protected AdminServiceInterface $adminService,
         protected RouterInterface $router,
         protected TemplateRendererInterface $template,
         protected AuthenticationServiceInterface $authenticationService,
         protected AdminForm $form,
-        protected SettingService $settingService,
     ) {
     }
 
@@ -61,21 +58,13 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             $params['order'],
         );
 
-        $settings = $this->settingService->findOneBy([
-            'admin'      => $this->adminService->getAdminRepository()->findOneBy([
-                'identity' => $this->authenticationService->getIdentity()->getIdentity(),
-            ]),
-            'identifier' => Setting::IDENTIFIER_TABLE_ADMIN_LIST_SELECTED_COLUMNS,
-        ]);
-
         $this->form->setAttribute('action', $this->router->generateUri('admin::admin-create'));
 
         return new HtmlResponse(
             $this->template->render('admin::list', [
                 'params'     => $params,
                 'admins'     => $result['rows'],
                 'statuses'   => Admin::STATUSES,
-                'settings'   => $settings?->getValue() ?? [],
                 'identifier' => Setting::IDENTIFIER_TABLE_ADMIN_LIST_SELECTED_COLUMNS,
                 'form'       => $this->form->prepare(),
                 'pagination' => new Pagination($result['total'], $result['offset'], $result['limit']),

src/Admin/src/Handler/Admin/GetAdminLoginListHandler.php

@@ -9,7 +9,6 @@
 use Admin\App\Common\ServerRequestAwareTrait;
 use Admin\App\Pagination;
 use Admin\Setting\Entity\Setting;
-use Admin\Setting\Service\SettingService;
 use Dot\DependencyInjection\Attribute\Inject;
 use Laminas\Authentication\AuthenticationServiceInterface;
 use Laminas\Diactoros\Response\HtmlResponse;
@@ -26,13 +25,11 @@ class GetAdminLoginListHandler implements RequestHandlerInterface
         AdminServiceInterface::class,
         TemplateRendererInterface::class,
         AuthenticationServiceInterface::class,
-        SettingService::class,
     )]
     public function __construct(
         protected AdminServiceInterface $adminService,
         protected TemplateRendererInterface $template,
         protected AuthenticationServiceInterface $authenticationService,
-        protected SettingService $settingService,
     ) {
     }
 
@@ -58,18 +55,10 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             ]
         );
 
-        $settings = $this->settingService->findOneBy([
-            'admin'      => $this->adminService->getAdminRepository()->findOneBy([
-                'identity' => $this->authenticationService->getIdentity()->getIdentity(),
-            ]),
-            'identifier' => Setting::IDENTIFIER_TABLE_ADMIN_LIST_LOGINS_SELECTED_COLUMNS,
-        ]);
-
         return new HtmlResponse(
             $this->template->render('admin::list-logins', [
                 'params'     => $params,
                 'logins'     => $logins['rows'],
-                'settings'   => $settings?->getValue() ?? [],
                 'statuses'   => [AdminLogin::LOGIN_FAIL, AdminLogin::LOGIN_SUCCESS],
                 'identities' => $this->adminService->getAdminLoginIdentities(),
                 'identifier' => Setting::IDENTIFIER_TABLE_ADMIN_LIST_LOGINS_SELECTED_COLUMNS,

src/Admin/templates/admin/list-logins.html.twig

@@ -183,7 +183,7 @@
 <script>
     const tableId = '#admin-logins-table';
     const storeSettingsUrl = '{{ path('setting::setting-store', {identifier: identifier}) }}';
-    const columnsSettings = JSON.parse('{{ settings|json_encode()|raw }}');
+    const getSettingsUrl = '{{ path('setting::setting-view', {identifier: identifier}) }}';
 </script>
 <script src="{{ asset('js/table_settings.js') }}" defer></script>
 {% endblock %}

src/Admin/templates/admin/list.html.twig

@@ -137,7 +137,7 @@
 <script>
     const tableId = '#admin-table';
     const storeSettingsUrl = '{{ path('setting::setting-store', {identifier: identifier}) }}';
-    const columnsSettings = JSON.parse('{{ settings|json_encode()|raw }}');
+    const getSettingsUrl = '{{ path('setting::setting-view', {identifier: identifier}) }}';
 </script>
 <script src="{{ asset('js/table_settings.js') }}" defer></script>
 <script src="{{ asset('js/admin.js') }}" defer></script>

src/App/assets/js/components/_table_settings.js

@@ -4,8 +4,8 @@ $(function() {
         return;
     }
 
-    if (! columnsSettings) {
-        console.error("Invalid or no column settings provided.")
+    if (! getSettingsUrl) {
+        console.error("Invalid or no getSettingsUrl provided.")
         return;
     }
 
@@ -14,12 +14,19 @@ $(function() {
         return;
     }
 
+    const getSettings = () => {
+        return fetch(getSettingsUrl, {
+            method: 'GET',
+        });
+    };
+
     const hideColumns = (tableId, visibleColumns) => {
         const table = $(tableId);
         if (visibleColumns.length === 0) {
             table.show();
             return;
         }
+
         $('.table-column').each((_, element) => {
             const column = $(element).data('column');
             toggleColumnVisibility(column, visibleColumns.includes(column));
@@ -92,9 +99,6 @@ $(function() {
         }
     }
 
-    populateColumnSelector('#column-selector', columnsSettings);
-    hideColumns(tableId, columnsSettings);
-
     $(document).on('change', '.toggle-column-checkbox', function () {
         const table = $(tableId);
         if (! table) {
@@ -124,4 +128,12 @@ $(function() {
     $(document).on('click', '.ui-checkbox', function (e) {
         $(e.currentTarget).prop('checked', !$(e.currentTarget).prop('checked'));
     });
+
+    getSettings()
+        .then((response) => response.json())
+        .then(settings => {
+            populateColumnSelector('#column-selector', settings.data.value);
+            hideColumns(tableId, settings.data.value);
+        })
+        .catch(error => console.error('Error: ', error));
 });

test/Unit/Admin/Handler/Admin/GetAdminListHandlerTest.php

@@ -31,10 +31,8 @@ public function testListAdminWillReturnHtmlResponse(): void
         $template              = $this->createMock(TemplateRendererInterface::class);
         $authenticationService = $this->createMock(AuthenticationServiceInterface::class);
         $form                  = $this->createMock(AdminForm::class);
-        $settingService        = $this->createMock(SettingService::class);
         $adminRepository       = $this->createMock(AdminRepository::class);
 
-        $settingService->method('findOneBy')->willReturn(null);
         $adminRepository->method('findOneBy')->willReturn($this->createMock(Admin::class));
         $adminService->method('getAdmins')->willReturn([
             'rows'   => [],
@@ -56,7 +54,6 @@ public function testListAdminWillReturnHtmlResponse(): void
             $template,
             $authenticationService,
             $form,
-            $settingService,
         );
 
         $response = $handler->handle($this->createMock(ServerRequestInterface::class));

test/Unit/Admin/Handler/Admin/GetAdminLoginListHandlerTest.php

@@ -10,7 +10,6 @@
 use Admin\Admin\Handler\Admin\GetAdminLoginListHandler;
 use Admin\Admin\Repository\AdminRepository;
 use Admin\Admin\Service\AdminServiceInterface;
-use Admin\Setting\Service\SettingService;
 use AdminTest\Unit\UnitTest;
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Authentication\AuthenticationServiceInterface;
@@ -29,10 +28,8 @@ public function testListAdminWillReturnHtmlResponse(): void
         $template              = $this->createMock(TemplateRendererInterface::class);
         $authenticationService = $this->createMock(AuthenticationServiceInterface::class);
         $form                  = $this->createMock(AdminForm::class);
-        $settingService        = $this->createMock(SettingService::class);
         $adminRepository       = $this->createMock(AdminRepository::class);
 
-        $settingService->method('findOneBy')->willReturn(null);
         $adminRepository->method('findOneBy')->willReturn($this->createMock(Admin::class));
         $adminService->method('getAdminLogins')->willReturn([
             'rows'   => [],
@@ -52,7 +49,6 @@ public function testListAdminWillReturnHtmlResponse(): void
             $adminService,
             $template,
             $authenticationService,
-            $settingService,
         );
 
         $response = $handler->handle($this->createMock(ServerRequestInterface::class));