アクセスルールグループ一覧 ユーザーグループとタイプ変更時の表示調整

plugins/baser-core/src/Controller/Admin/PermissionGroupsController.php

@@ -49,11 +49,23 @@ public function index(PermissionGroupsAdminServiceInterface $service, ?int $user
             }
         }
 
+        $authPrefixes = $service->getControlSource('auth_prefix', [
+          'user_group_id' => $userGroupId,
+        ]);
+        $authPrefixes = array_keys($authPrefixes);
+
         $request = $this->getRequest();
+        $listType = $request->getQuery('list_type');
+        if (!in_array($listType, $authPrefixes)) {
+            $listType = $authPrefixes[0];
+        }
+
         $this->setRequest($request->withParsedBody([
-            'list_type' => $request->getQuery('list_type'),
+            'list_type' => $listType,
             'filter_user_group_id' => $userGroupId
         ]));
+        $request = $this->getRequest();
+
         $this->set($service->getViewVarsForIndex($userGroupId, $request));
     }
 

plugins/baser-core/src/Service/Admin/PermissionGroupsAdminService.php

@@ -42,7 +42,7 @@ public function getViewVarsForIndex(int $userGroupId, ServerRequest $request): a
         return [
             'entities' => $this->getIndex($userGroupId, array_merge(
                 ['permission_amount' => true],
-                $request->getQueryParams()
+                $request->getData()
             )),
             'userGroupId' => $currentUserGroup->id ?? "0"
         ];

plugins/baser-core/tests/TestCase/Service/Admin/PermissionGroupsAdminServiceTest.php

@@ -79,7 +79,7 @@ public function testGetViewVarsForIndex(): void
         $request = $this->getRequest('/baser/admin/baser-core/permission_groups/index?list_type=Nghiem&permission_amount=false');
         $vars = $this->PermissionGroupsAdmin->getViewVarsForIndex(1, $request);
         $entities = $vars['entities']->all();
-        $this->assertCount(0, $entities);
+        $this->assertCount(3, $entities);
     }
 
     /**

plugins/bc-admin-third/src/js/admin/permission_groups/index.js

@@ -11,10 +11,16 @@
 
 const permissionGroupsIndex = {
 
+    /**
+     * 初期のユーザーグループID
+     */
+    initialUserGroupId: 0,
+
     /**
      * 初期化
      */
     mounted() {
+        this.initialUserGroupId = $('#filter-user-group-id').val();
         this.registerEvents();
     },
 
@@ -33,10 +39,11 @@ const permissionGroupsIndex = {
         $.bcUtil.showLoader();
         let userGroupId = $('#filter-user-group-id').val();
         let listType = $('input[name="list_type"]:checked').val();
-        if(userGroupId === '0') {
-            listType = 'Front';
+        if (permissionGroupsIndex.initialUserGroupId === userGroupId) {
+            location.href = `${$.bcUtil.adminBaseUrl}baser-core/permission_groups/index/${userGroupId}?list_type=${listType}`;
+        } else {
+            location.href = `${$.bcUtil.adminBaseUrl}baser-core/permission_groups/index/${userGroupId}`;
         }
-        location.href = `${$.bcUtil.adminBaseUrl}baser-core/permission_groups/index/${userGroupId}?list_type=${listType}`;
     }
 
 }