diff --git a/resources/js/pages/admin/academic-classes/assignments/columns.tsx b/resources/js/pages/admin/academic-classes/assignments/columns.tsx index 91f638b..37337d7 100644 --- a/resources/js/pages/admin/academic-classes/assignments/columns.tsx +++ b/resources/js/pages/admin/academic-classes/assignments/columns.tsx @@ -26,7 +26,7 @@ export function createAssignmentColumns( canViewSubmissions, } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'title', header: () => Judul, @@ -96,7 +96,10 @@ export function createAssignmentColumns( ), }, - { + ]; + + if (canViewSubmissions || canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -133,6 +136,8 @@ export function createAssignmentColumns( /> ); }, - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/academic-classes/assignments/submissions.tsx b/resources/js/pages/admin/academic-classes/assignments/submissions.tsx index efd341a..976c9e6 100644 --- a/resources/js/pages/admin/academic-classes/assignments/submissions.tsx +++ b/resources/js/pages/admin/academic-classes/assignments/submissions.tsx @@ -129,7 +129,10 @@ export default function SubmissionIndex({
{row.original.score ?? '-'}
), }, - { + ]; + + if (canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -156,8 +159,8 @@ export default function SubmissionIndex({ ]} /> ), - }, - ]; + }); + } return ( <> diff --git a/resources/js/pages/admin/academic-classes/materials/columns.tsx b/resources/js/pages/admin/academic-classes/materials/columns.tsx index cb3f8bf..8840764 100644 --- a/resources/js/pages/admin/academic-classes/materials/columns.tsx +++ b/resources/js/pages/admin/academic-classes/materials/columns.tsx @@ -18,7 +18,7 @@ export function createMaterialColumns( ): ColumnDef[] { const { handleEdit, handleDeleteClick, canUpdate, canDelete } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'meeting_number', header: () => Pertemuan, @@ -86,7 +86,10 @@ export function createMaterialColumns( ); }, }, - { + ]; + + if (canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -117,6 +120,8 @@ export function createMaterialColumns( /> ); }, - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/finances/tuition-invoices/columns.tsx b/resources/js/pages/admin/finances/tuition-invoices/columns.tsx index 93d839f..8cade52 100644 --- a/resources/js/pages/admin/finances/tuition-invoices/columns.tsx +++ b/resources/js/pages/admin/finances/tuition-invoices/columns.tsx @@ -30,7 +30,7 @@ export function createTuitionInvoiceColumns( canViewPayments, } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'student.student_number', header: () => Mahasiswa, @@ -126,7 +126,10 @@ export function createTuitionInvoiceColumns( ); }, }, - { + ]; + + if (canViewPayments || canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -163,6 +166,8 @@ export function createTuitionInvoiceColumns( /> ); }, - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/finances/tuition-invoices/payments.tsx b/resources/js/pages/admin/finances/tuition-invoices/payments.tsx index 476efbf..1f3f2ba 100644 --- a/resources/js/pages/admin/finances/tuition-invoices/payments.tsx +++ b/resources/js/pages/admin/finances/tuition-invoices/payments.tsx @@ -148,7 +148,10 @@ export default function TuitionPaymentIndex({ invoice, payments }: Props) { ); }, }, - { + ]; + + if (canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -175,8 +178,8 @@ export default function TuitionPaymentIndex({ invoice, payments }: Props) { ]} /> ), - }, - ]; + }); + } return ( <> diff --git a/resources/js/pages/admin/manage/announcements/columns.tsx b/resources/js/pages/admin/manage/announcements/columns.tsx index 844d6dd..714f93c 100644 --- a/resources/js/pages/admin/manage/announcements/columns.tsx +++ b/resources/js/pages/admin/manage/announcements/columns.tsx @@ -19,7 +19,7 @@ export function createAnnouncementColumns( ): ColumnDef[] { const { handleEdit, handleDeleteClick, canUpdate, canDelete } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'title', header: () => Judul, @@ -71,7 +71,10 @@ export function createAnnouncementColumns( cell: ({ row }) => format(new Date(row.original.created_at), 'd MMM yyyy, HH:mm'), }, - { + ]; + + if (canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -98,6 +101,8 @@ export function createAnnouncementColumns( ]} /> ), - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/manage/course-classes/columns.tsx b/resources/js/pages/admin/manage/course-classes/columns.tsx index fba81e6..60a6ca8 100644 --- a/resources/js/pages/admin/manage/course-classes/columns.tsx +++ b/resources/js/pages/admin/manage/course-classes/columns.tsx @@ -28,7 +28,7 @@ export function createCourseClassColumns( canViewEnrollments, } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'course.name', header: () => Mata Kuliah, @@ -90,7 +90,10 @@ export function createCourseClassColumns( ), }, - { + ]; + + if (canViewEnrollments || canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -127,6 +130,8 @@ export function createCourseClassColumns( /> ); }, - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/manage/course-classes/enrollments.tsx b/resources/js/pages/admin/manage/course-classes/enrollments.tsx index 12d4640..d0753ea 100644 --- a/resources/js/pages/admin/manage/course-classes/enrollments.tsx +++ b/resources/js/pages/admin/manage/course-classes/enrollments.tsx @@ -82,7 +82,10 @@ export default function ClassEnrollmentIndex({ : '-'; }, }, - { + ]; + + if (canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -103,8 +106,8 @@ export default function ClassEnrollmentIndex({ ]} /> ), - }, - ]; + }); + } return ( <> diff --git a/resources/js/pages/admin/master/academic-terms/columns.tsx b/resources/js/pages/admin/master/academic-terms/columns.tsx index 7ef8cdf..62978be 100644 --- a/resources/js/pages/admin/master/academic-terms/columns.tsx +++ b/resources/js/pages/admin/master/academic-terms/columns.tsx @@ -29,7 +29,7 @@ export function createAcademicTermColumns( canUpdateStatus, } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'name', header: () => Nama, @@ -89,7 +89,10 @@ export function createAcademicTermColumns( ); }, }, - { + ]; + + if (canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -120,6 +123,8 @@ export function createAcademicTermColumns( /> ); }, - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/master/courses/columns.tsx b/resources/js/pages/admin/master/courses/columns.tsx index 77ffc44..6bcbfde 100644 --- a/resources/js/pages/admin/master/courses/columns.tsx +++ b/resources/js/pages/admin/master/courses/columns.tsx @@ -18,7 +18,7 @@ export function createCourseColumns( ): ColumnDef[] { const { handleEdit, handleDeleteClick, canUpdate, canDelete } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'code', header: () => Kode, @@ -73,7 +73,10 @@ export function createCourseColumns( ); }, }, - { + ]; + + if (canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -104,6 +107,8 @@ export function createCourseColumns( /> ); }, - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/master/departments/columns.tsx b/resources/js/pages/admin/master/departments/columns.tsx index ce1babf..2394106 100644 --- a/resources/js/pages/admin/master/departments/columns.tsx +++ b/resources/js/pages/admin/master/departments/columns.tsx @@ -18,7 +18,7 @@ export function createDepartmentColumns( ): ColumnDef[] { const { handleEdit, handleDeleteClick, canUpdate, canDelete } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'code', header: () => Kode, @@ -55,7 +55,10 @@ export function createDepartmentColumns( ); }, }, - { + ]; + + if (canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -86,6 +89,8 @@ export function createDepartmentColumns( /> ); }, - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/services/academic-advising-logs/columns.tsx b/resources/js/pages/admin/services/academic-advising-logs/columns.tsx index db1de0e..cebb22a 100644 --- a/resources/js/pages/admin/services/academic-advising-logs/columns.tsx +++ b/resources/js/pages/admin/services/academic-advising-logs/columns.tsx @@ -18,7 +18,7 @@ export function createAcademicAdvisingLogColumns( ): ColumnDef[] { const { handleEdit, handleDeleteClick, canUpdate, canDelete } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'student.student_number', header: () => Mahasiswa, @@ -72,7 +72,10 @@ export function createAcademicAdvisingLogColumns( : '-'; }, }, - { + ]; + + if (canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -99,6 +102,8 @@ export function createAcademicAdvisingLogColumns( ]} /> ), - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/services/letter-requests/columns.tsx b/resources/js/pages/admin/services/letter-requests/columns.tsx index d0745f0..c3d4329 100644 --- a/resources/js/pages/admin/services/letter-requests/columns.tsx +++ b/resources/js/pages/admin/services/letter-requests/columns.tsx @@ -20,7 +20,7 @@ export function createLetterRequestColumns( ): ColumnDef[] { const { handleEdit, handleDeleteClick, canUpdate, canDelete } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'student.student_number', header: () => Mahasiswa, @@ -132,7 +132,10 @@ export function createLetterRequestColumns( ); }, }, - { + ]; + + if (canUpdate || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -159,6 +162,8 @@ export function createLetterRequestColumns( ]} /> ), - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/users/administrators/columns.tsx b/resources/js/pages/admin/users/administrators/columns.tsx index 881f3ba..6846813 100644 --- a/resources/js/pages/admin/users/administrators/columns.tsx +++ b/resources/js/pages/admin/users/administrators/columns.tsx @@ -38,7 +38,7 @@ export function createAdministratorColumns( canUpdateStatus, } = params; - return [ + const columns: ColumnDef[] = [ { accessorKey: 'profile.full_name', header: () => Nama Lengkap, @@ -86,7 +86,10 @@ export function createAdministratorColumns( /> ), }, - { + ]; + + if (canUpdate || canResetPassword || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -123,6 +126,8 @@ export function createAdministratorColumns( /> ); }, - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/users/lecturers/columns.tsx b/resources/js/pages/admin/users/lecturers/columns.tsx index 6446291..d4c6998 100644 --- a/resources/js/pages/admin/users/lecturers/columns.tsx +++ b/resources/js/pages/admin/users/lecturers/columns.tsx @@ -41,7 +41,7 @@ export function createLecturerColumns( canUpdateStatus, } = params; - return [ + const columns: ColumnDef[] = [ { id: 'identity', header: () => NIDN, @@ -104,7 +104,10 @@ export function createLecturerColumns( /> ), }, - { + ]; + + if (canUpdate || canResetPassword || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -141,6 +144,8 @@ export function createLecturerColumns( /> ); }, - }, - ]; + }); + } + + return columns; } diff --git a/resources/js/pages/admin/users/students/columns.tsx b/resources/js/pages/admin/users/students/columns.tsx index 0c79a59..b1ddae9 100644 --- a/resources/js/pages/admin/users/students/columns.tsx +++ b/resources/js/pages/admin/users/students/columns.tsx @@ -63,7 +63,7 @@ export function createStudentColumns( canUpdateAccountStatus, } = params; - return [ + const columns: ColumnDef[] = [ { id: 'identity', header: () => NIM, @@ -143,7 +143,10 @@ export function createStudentColumns( /> ), }, - { + ]; + + if (canUpdate || canResetPassword || canDelete) { + columns.push({ id: 'actions', header: () => Aksi, meta: { @@ -180,6 +183,8 @@ export function createStudentColumns( /> ); }, - }, - ]; + }); + } + + return columns; }