diff --git a/app/Http/Controllers/Admin/Finance/ExpenseController.php b/app/Http/Controllers/Admin/Finance/ExpenseController.php index 962bbe5..881eb3a 100644 --- a/app/Http/Controllers/Admin/Finance/ExpenseController.php +++ b/app/Http/Controllers/Admin/Finance/ExpenseController.php @@ -15,7 +15,7 @@ class ExpenseController extends Controller public function index(): Response { return Inertia::render('admin/finance/expense/index', [ - 'expenses' => Expense::with(['media', 'user'])->latest()->get(), + 'expenses' => Expense::with(['media', 'user'])->latest()->paginate(10), ]); } diff --git a/app/Http/Controllers/Admin/Finance/PayrollController.php b/app/Http/Controllers/Admin/Finance/PayrollController.php index be5f6ed..9918374 100644 --- a/app/Http/Controllers/Admin/Finance/PayrollController.php +++ b/app/Http/Controllers/Admin/Finance/PayrollController.php @@ -28,7 +28,7 @@ public function index(): Response $query->where('user_id', auth()->id()); }) ->latest() - ->get(), + ->paginate(10), 'currentMonthPayrolls' => Payroll::with(['user.profile', 'adjustments']) ->where('period_month', $currentMonth) ->when(auth()->user()->hasRole('Admin'), function ($query) { diff --git a/app/Http/Controllers/Admin/Manage/OrderController.php b/app/Http/Controllers/Admin/Manage/OrderController.php index 8541edd..0c11f59 100644 --- a/app/Http/Controllers/Admin/Manage/OrderController.php +++ b/app/Http/Controllers/Admin/Manage/OrderController.php @@ -23,7 +23,7 @@ class OrderController extends Controller public function index(): Response { return Inertia::render('admin/manage/order/index', [ - 'orders' => Order::with(['items.product', 'user'])->latest()->get(), + 'orders' => Order::with(['items.product', 'user'])->latest()->paginate(10), ]); } diff --git a/app/Http/Controllers/Admin/Manage/PurchaseController.php b/app/Http/Controllers/Admin/Manage/PurchaseController.php index 082c705..b3aafc1 100644 --- a/app/Http/Controllers/Admin/Manage/PurchaseController.php +++ b/app/Http/Controllers/Admin/Manage/PurchaseController.php @@ -19,7 +19,7 @@ class PurchaseController extends Controller public function index(): Response { return Inertia::render('admin/manage/purchase/index', [ - 'purchases' => Purchase::with(['items.product'])->latest()->get(), + 'purchases' => Purchase::with(['items.product'])->latest()->paginate(10), ]); } diff --git a/app/Http/Controllers/Admin/Master/CategoryController.php b/app/Http/Controllers/Admin/Master/CategoryController.php index 4c31dc5..c47f170 100644 --- a/app/Http/Controllers/Admin/Master/CategoryController.php +++ b/app/Http/Controllers/Admin/Master/CategoryController.php @@ -15,7 +15,7 @@ class CategoryController extends Controller public function index(): Response { return Inertia::render('admin/master/category/index', [ - 'categories' => Category::latest()->get(), + 'categories' => Category::latest()->paginate(10), ]); } diff --git a/app/Http/Controllers/Admin/Master/ProductController.php b/app/Http/Controllers/Admin/Master/ProductController.php index 67447c6..a328797 100644 --- a/app/Http/Controllers/Admin/Master/ProductController.php +++ b/app/Http/Controllers/Admin/Master/ProductController.php @@ -20,7 +20,7 @@ class ProductController extends Controller public function index(): Response { return Inertia::render('admin/master/product/index', [ - 'products' => Product::with(['prices', 'categories', 'media'])->latest()->get(), + 'products' => Product::with(['prices', 'categories', 'media'])->latest()->paginate(10), 'categories' => Category::active()->get(), ]); } diff --git a/app/Http/Controllers/Admin/Master/UserController.php b/app/Http/Controllers/Admin/Master/UserController.php index 030be45..93db334 100644 --- a/app/Http/Controllers/Admin/Master/UserController.php +++ b/app/Http/Controllers/Admin/Master/UserController.php @@ -19,7 +19,7 @@ class UserController extends Controller public function index(): Response { return Inertia::render('admin/master/user/index', [ - 'users' => User::with(['profile', 'roles'])->latest()->get(), + 'users' => User::with(['profile', 'roles'])->latest()->paginate(10), 'roles' => Role::all(), 'defaultPassword' => config('auth.password_default', 'password'), ]); diff --git a/app/Http/Controllers/Admin/System/ActivityLogController.php b/app/Http/Controllers/Admin/System/ActivityLogController.php index f5338bb..71345d9 100644 --- a/app/Http/Controllers/Admin/System/ActivityLogController.php +++ b/app/Http/Controllers/Admin/System/ActivityLogController.php @@ -13,9 +13,8 @@ public function index(): Response { $activities = Activity::with('causer') ->latest() - ->limit(500) - ->get() - ->map(fn ($activity) => [ + ->paginate(10) + ->through(fn ($activity) => [ 'id' => $activity->id, 'description' => $activity->description, 'module' => $activity->log_name, diff --git a/app/Http/Controllers/Admin/System/RoleController.php b/app/Http/Controllers/Admin/System/RoleController.php index 3eea6b5..2061e7d 100644 --- a/app/Http/Controllers/Admin/System/RoleController.php +++ b/app/Http/Controllers/Admin/System/RoleController.php @@ -18,7 +18,7 @@ class RoleController extends Controller public function index(): Response { return Inertia::render('admin/system/role/index', [ - 'roles' => Role::with('permissions')->latest()->get(), + 'roles' => Role::with('permissions')->latest()->paginate(10), ]); } diff --git a/resources/js/pages/admin/finance/expense/index.tsx b/resources/js/pages/admin/finance/expense/index.tsx index f3010ed..15c93c2 100644 --- a/resources/js/pages/admin/finance/expense/index.tsx +++ b/resources/js/pages/admin/finance/expense/index.tsx @@ -6,13 +6,14 @@ import { ImagePreviewDialog } from '@/components/modal/image-preview'; import { Button } from '@/components/ui/button'; import { Card, CardContent } from '@/components/ui/card'; import type { Expense } from '@/types'; +import type { PaginatedData } from '@/types/pagination'; import { useExpenseIndex } from './hooks/use-expense-index'; import { getColumns } from './partials/columns'; import { ExpenseFormModal } from './partials/expense-form-modal'; import { usePermission } from '@/hooks/use-permission'; -export default function ExpenseIndex({ expenses }: { expenses: Expense[] }) { +export default function ExpenseIndex({ expenses }: { expenses: PaginatedData }) { const { hasPermission } = usePermission(); const { selectedProof, @@ -67,7 +68,8 @@ export default function ExpenseIndex({ expenses }: { expenses: Expense[] }) { ; currentMonthPayrolls: Payroll[]; }) { const { hasPermission } = usePermission(); @@ -106,7 +107,8 @@ export default function PayrollIndex({ }) { const { hasPermission } = usePermission(); const { isDeleteDialogOpen, @@ -84,7 +85,8 @@ export default function OrderIndex({ orders }: { orders: Order[] }) { }) { const { hasPermission } = usePermission(); const { isDeleteDialogOpen, @@ -57,7 +58,8 @@ export default function PurchaseIndex({ purchases }: { purchases: Purchase[] }) }) { const { hasPermission } = usePermission(); const { isFormOpen, @@ -64,7 +64,8 @@ export default function CategoryIndex({ categories }: { categories: Category[] } , categories: Category[] }) { const { hasPermission } = usePermission(); const { selectedImage, @@ -59,7 +60,8 @@ export default function ProductIndex({ products, categories }: { products: Produ , defaultPassword: string }) { const { hasPermission } = usePermission(); const { isDeleteDialogOpen, @@ -71,7 +72,8 @@ export default function UserIndex({ users, defaultPassword }: { users: User[], d ; } export default function ActivityLogIndex({ activities }: Props) { @@ -25,7 +26,8 @@ export default function ActivityLogIndex({ activities }: Props) { }) { const { hasPermission } = usePermission(); const { isDeleteDialogOpen, @@ -53,7 +54,8 @@ export default function RoleIndex({ roles }: { roles: Role[] }) { assertInertia(fn ($page) => $page ->component('admin/finance/expense/index') ->has('expenses', fn ($page) => $page - ->has('0.user') + ->has('data.0.user') ->etc() ) ); diff --git a/tests/Feature/Admin/Finance/PayrollTest.php b/tests/Feature/Admin/Finance/PayrollTest.php index 79f71cf..3e7b489 100644 --- a/tests/Feature/Admin/Finance/PayrollTest.php +++ b/tests/Feature/Admin/Finance/PayrollTest.php @@ -51,7 +51,7 @@ ->assertOk() ->assertInertia(fn ($page) => $page ->component('admin/finance/payroll/index') - ->has('payrolls') + ->has('payrolls', fn ($page) => $page->has('data')->etc()) ->has('currentMonthPayrolls') ); }); diff --git a/tests/Feature/Admin/Manage/OrderTest.php b/tests/Feature/Admin/Manage/OrderTest.php index 3c0c1e6..20c5305 100644 --- a/tests/Feature/Admin/Manage/OrderTest.php +++ b/tests/Feature/Admin/Manage/OrderTest.php @@ -55,10 +55,10 @@ ->assertInertia(fn ($page) => $page ->component('admin/manage/order/index') ->has('orders', fn ($page) => $page - ->has('0.user') - ->has('0.cogs_formatted') - ->has('0.payment_formatted') - ->has('0.created_at_formatted') + ->has('data.0.user') + ->has('data.0.cogs_formatted') + ->has('data.0.payment_formatted') + ->has('data.0.created_at_formatted') ->etc() ) ); diff --git a/tests/Feature/Admin/Manage/PurchaseTest.php b/tests/Feature/Admin/Manage/PurchaseTest.php index 2b695fe..eb73ae1 100644 --- a/tests/Feature/Admin/Manage/PurchaseTest.php +++ b/tests/Feature/Admin/Manage/PurchaseTest.php @@ -48,7 +48,10 @@ ->assertOk() ->assertInertia(fn ($page) => $page ->component('admin/manage/purchase/index') - ->has('purchases') + ->has('purchases', fn ($page) => $page + ->has('data') + ->etc() + ) ); }); diff --git a/tests/Feature/Admin/Master/CategoryTest.php b/tests/Feature/Admin/Master/CategoryTest.php index e59d1f2..4bb0f0c 100644 --- a/tests/Feature/Admin/Master/CategoryTest.php +++ b/tests/Feature/Admin/Master/CategoryTest.php @@ -47,7 +47,10 @@ ->assertOk() ->assertInertia(fn ($page) => $page ->component('admin/master/category/index') - ->has('categories') + ->has('categories', fn ($page) => $page + ->has('data') + ->etc() + ) ); }); diff --git a/tests/Feature/Admin/Master/ProductTest.php b/tests/Feature/Admin/Master/ProductTest.php index 0e7599b..2e5ce20 100644 --- a/tests/Feature/Admin/Master/ProductTest.php +++ b/tests/Feature/Admin/Master/ProductTest.php @@ -51,7 +51,10 @@ ->assertOk() ->assertInertia(fn ($page) => $page ->component('admin/master/product/index') - ->has('products') + ->has('products', fn ($page) => $page + ->has('data') + ->etc() + ) ->has('categories') ); }); diff --git a/tests/Feature/Admin/Master/UserTest.php b/tests/Feature/Admin/Master/UserTest.php index 6a7f25a..242922c 100644 --- a/tests/Feature/Admin/Master/UserTest.php +++ b/tests/Feature/Admin/Master/UserTest.php @@ -49,7 +49,7 @@ ->assertOk() ->assertInertia(fn ($page) => $page ->component('admin/master/user/index') - ->has('users') + ->has('users', fn ($page) => $page->has('data')->etc()) ->has('roles') ->has('defaultPassword') ); diff --git a/tests/Feature/Admin/System/ActivityLogTest.php b/tests/Feature/Admin/System/ActivityLogTest.php index c33d283..2557f3d 100644 --- a/tests/Feature/Admin/System/ActivityLogTest.php +++ b/tests/Feature/Admin/System/ActivityLogTest.php @@ -42,7 +42,7 @@ ->assertOk() ->assertInertia(fn ($page) => $page ->component('admin/system/activity-log/index') - ->has('activities') + ->has('activities', fn ($page) => $page->has('data')->etc()) ); }); }); diff --git a/tests/Feature/Admin/System/RoleTest.php b/tests/Feature/Admin/System/RoleTest.php index 7094775..9dba0d7 100644 --- a/tests/Feature/Admin/System/RoleTest.php +++ b/tests/Feature/Admin/System/RoleTest.php @@ -47,7 +47,7 @@ ->assertOk() ->assertInertia(fn ($page) => $page ->component('admin/system/role/index') - ->has('roles') + ->has('roles', fn ($page) => $page->has('data')->etc()) ); });