Merge pull request #56 from balajidharma/2.x-Changes

Added DTO to user

Author: balajidharma

app/Http/Controllers/Admin/MenuItemController.php

@@ -49,7 +49,7 @@ public function index(Menu $menu)
     public function create(Menu $menu)
     {
         $itemOptions = MenuItem::selectOptions($menu->id, null, true);
-        $roles = Role::all()->pluck('name', 'id');
+        $roles = Role::all()->pluck('name', 'name');
 
         return Inertia::render('Admin/Menu/Item/Create', compact('menu', 'itemOptions', 'roles'));
     }
@@ -64,7 +64,7 @@ public function store(StoreMenuItemRequest $request, Menu $menu)
         $item = $menu->menuItems()->create($request->except(['roles']));
 
         $roles = $request->roles ?? [];
-        $item->assignRole(array_map('intval', $roles));
+        $item->assignRole($roles);
 
         return redirect()->route('admin.menu.item.index', $menu->id)
             ->with('message', 'Menu Item created successfully.');
@@ -78,8 +78,8 @@ public function store(StoreMenuItemRequest $request, Menu $menu)
     public function edit(Menu $menu, MenuItem $item)
     {
         $itemOptions = MenuItem::selectOptions($menu->id, $item->parent_id ?? $item->id);
-        $roles = Role::all()->pluck('name', 'id');
-        $itemHasRoles = array_column(json_decode($item->roles, true), 'id');
+        $roles = Role::all()->pluck('name', 'name');
+        $itemHasRoles = array_column(json_decode($item->roles, true), 'name');
 
         return Inertia::render('Admin/Menu/Item/Edit', compact('menu', 'item', 'itemOptions', 'roles', 'itemHasRoles'));
     }
@@ -94,7 +94,7 @@ public function update(UpdateMenuItemRequest $request, Menu $menu, MenuItem $ite
         $item->update($request->except(['roles']));
 
         $roles = $request->roles ?? [];
-        $item->syncRoles(array_map('intval', $roles));
+        $item->syncRoles($roles);
 
         return redirect()->route('admin.menu.item.index', $menu->id)
             ->with('message', 'Menu Item updated successfully.');

app/Http/Controllers/Admin/RoleController.php

@@ -98,8 +98,8 @@ public function store(StoreRoleRequest $request)
      */
     public function show(Role $role)
     {
-        $permissions = Permission::all()->pluck('name', 'id');
-        $roleHasPermissions = array_column(json_decode($role->permissions, true), 'id');
+        $permissions = Permission::all()->pluck('name', 'name');
+        $roleHasPermissions = array_column(json_decode($role->permissions, true), 'name');
 
         return Inertia::render('Admin/Role/Show', [
             'role' => $role,
@@ -115,8 +115,8 @@ public function show(Role $role)
      */
     public function edit(Role $role)
     {
-        $permissions = Permission::all()->pluck('name', 'id');
-        $roleHasPermissions = array_column(json_decode($role->permissions, true), 'id');
+        $permissions = Permission::all()->pluck('name', 'name');
+        $roleHasPermissions = array_column(json_decode($role->permissions, true), 'name');
 
         return Inertia::render('Admin/Role/Edit', [
             'role' => $role,

app/Http/Controllers/Admin/UserController.php

@@ -7,8 +7,8 @@
 use App\Models\User;
 use BalajiDharma\LaravelAdminCore\Actions\User\CreateUser;
 use BalajiDharma\LaravelAdminCore\Actions\User\UpdateUser;
-use BalajiDharma\LaravelAdminCore\Requests\StoreUserRequest;
-use BalajiDharma\LaravelAdminCore\Requests\UpdateUserRequest;
+use BalajiDharma\LaravelAdminCore\Requests\User\StoreUserRequest;
+use BalajiDharma\LaravelAdminCore\Requests\User\UpdateUserRequest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
@@ -72,7 +72,7 @@ public function index()
      */
     public function create()
     {
-        $roles = Role::all()->pluck('name', 'id');
+        $roles = Role::all()->pluck('name', 'name');
 
         return Inertia::render('Admin/User/Create', [
             'roles' => $roles,
@@ -86,7 +86,7 @@ public function create()
      */
     public function store(StoreUserRequest $request, CreateUser $createUser)
     {
-        $createUser->handle((object) $request->all());
+        $createUser->handle($request->getUserData());
 
         return redirect()->route('admin.user.index')
             ->with('message', __('User created successfully.'));
@@ -100,7 +100,7 @@ public function store(StoreUserRequest $request, CreateUser $createUser)
     public function show(User $user)
     {
         $roles = Role::all()->pluck('name', 'id');
-        $userHasRoles = array_column(json_decode($user->roles, true), 'id');
+        $userHasRoles = array_column(json_decode($user->roles, true), 'name');
 
         return Inertia::render('Admin/User/Show', [
             'user' => $user,
@@ -116,8 +116,8 @@ public function show(User $user)
      */
     public function edit(User $user)
     {
-        $roles = Role::all()->pluck('name', 'id');
-        $userHasRoles = array_column(json_decode($user->roles, true), 'id');
+        $roles = Role::all()->pluck('name', 'name');
+        $userHasRoles = array_column(json_decode($user->roles, true), 'name');
 
         return Inertia::render('Admin/User/Edit', [
             'user' => $user,
@@ -133,7 +133,7 @@ public function edit(User $user)
      */
     public function update(UpdateUserRequest $request, User $user, UpdateUser $updateUser)
     {
-        $updateUser->handle((object) $request->all(), $user);
+        $updateUser->handle($request->getUserData(), $user);
 
         return redirect()->route('admin.user.index')
             ->with('message', __('User updated successfully.'));

composer.json

@@ -6,7 +6,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "balajidharma/laravel-admin-core": "^1.0",
+        "balajidharma/laravel-admin-core": "^2.0",
         "inertiajs/inertia-laravel": "^1.0",
         "laravel/framework": "^11.0",
         "laravel/sanctum": "^4.0",