diff --git a/src/components/pages/expense/ExpenseRealizationContent.tsx b/src/components/pages/expense/ExpenseRealizationContent.tsx index 2b5b0a0a..c69f089f 100644 --- a/src/components/pages/expense/ExpenseRealizationContent.tsx +++ b/src/components/pages/expense/ExpenseRealizationContent.tsx @@ -4,6 +4,7 @@ import toast from 'react-hot-toast'; import Link from 'next/link'; import { Icon } from '@iconify/react'; import Button from '@/components/Button'; +import RequirePermission from '@/components/helper/RequirePermission'; import Card from '@/components/Card'; import DropFileInput from '@/components/input/DropFileInput'; @@ -62,16 +63,17 @@ const ExpenseRealizationContent = ({
- {/* TODO: apply RBAC */} - + + +
@@ -124,36 +126,38 @@ const ExpenseRealizationContent = ({ )}
-
- + +
+ - {formik.values.documents && - formik.values.documents.length > 0 && ( - - )} -
+ {formik.values.documents && + formik.values.documents.length > 0 && ( + + )} +
+ diff --git a/src/components/pages/expense/ExpenseRequestContent.tsx b/src/components/pages/expense/ExpenseRequestContent.tsx index 0d7d959d..b937c5bc 100644 --- a/src/components/pages/expense/ExpenseRequestContent.tsx +++ b/src/components/pages/expense/ExpenseRequestContent.tsx @@ -19,6 +19,7 @@ import { useModal } from '@/components/Modal'; import ConfirmationModal from '@/components/modal/ConfirmationModal'; import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes'; import ExpensePDFPreviewButton from '@/components/pages/expense//pdf/ExpensePDFButton'; +import RequirePermission from '@/components/helper/RequirePermission'; import { Expense } from '@/types/api/expense'; import { formatCurrency, formatDate } from '@/lib/helper'; @@ -255,100 +256,119 @@ const ExpenseRequestContent = ({
{isCurrentApprovalOnManager && ( - + + + )} {isCurrentApprovalOnFinance && ( - + + + )} {isCurrentApprovalOnRealization && ( - + + + )} {showRejectButton && ( - + + )} {isExpenseCanBeRealized && ( - + + + )}
{showEditButton && ( - + + + )} - + + +
@@ -485,36 +505,42 @@ const ExpenseRequestContent = ({ )} -
- + +
+ - {formik.values.documents && - formik.values.documents.length > 0 && ( - - )} -
+ {formik.values.documents && + formik.values.documents.length > 0 && ( + + )} +
+ diff --git a/src/components/pages/expense/ExpensesTable.tsx b/src/components/pages/expense/ExpensesTable.tsx index bbcb6c4e..9ae3ed34 100644 --- a/src/components/pages/expense/ExpensesTable.tsx +++ b/src/components/pages/expense/ExpensesTable.tsx @@ -28,6 +28,7 @@ import ExpenseStatusBadge from '@/components/pages/expense/ExpenseStatusBadge'; import CheckboxInput from '@/components/input/CheckboxInput'; import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWithNotes'; import DateInput from '@/components/input/DateInput'; +import RequirePermission from '@/components/helper/RequirePermission'; import { Expense } from '@/types/api/expense'; import { ExpenseApi } from '@/services/api/expense'; @@ -67,58 +68,70 @@ const RowOptionsMenu = ({ return (
- - - {showEditButton && ( + + + + {showEditButton && ( + + + )} {showRealizationButton && ( - + + + )} - + + +
); @@ -559,57 +572,70 @@ const ExpensesTable = () => {
- + + + {selectedRowIds.length > 0 && ( <> - + + + - + + + - + + )}
diff --git a/src/components/pages/expense/form/ExpenseRealizationForm.tsx b/src/components/pages/expense/form/ExpenseRealizationForm.tsx index a7ebdbca..d1c7c5f2 100644 --- a/src/components/pages/expense/form/ExpenseRealizationForm.tsx +++ b/src/components/pages/expense/form/ExpenseRealizationForm.tsx @@ -16,6 +16,7 @@ import DateInput from '@/components/input/DateInput'; import DropFileInput from '@/components/input/DropFileInput'; import ExpenseKandangsTable from '@/components/pages/expense/form/ExpenseKandangsTable'; import ExpenseRealizationKandangDetailExpense from '@/components/pages/expense/form/ExpenseRealizationKandangDetailExpense'; +import RequirePermission from '@/components/helper/RequirePermission'; import { CreateExpenseRealizationPayload, @@ -290,21 +291,23 @@ const ExpenseRealizationForm = ({ className={{ wrapper: 'col-span-12' }} /> - + + + {formik.values.existing_documents && formik.values.existing_documents.length > 0 && ( @@ -357,20 +360,22 @@ const ExpenseRealizationForm = ({ {type !== 'add' && (
{type !== 'edit' && ( - + + + )}
)} diff --git a/src/components/pages/expense/form/ExpenseRequestForm.tsx b/src/components/pages/expense/form/ExpenseRequestForm.tsx index d52bde0d..71160785 100644 --- a/src/components/pages/expense/form/ExpenseRequestForm.tsx +++ b/src/components/pages/expense/form/ExpenseRequestForm.tsx @@ -18,6 +18,7 @@ import DateInput from '@/components/input/DateInput'; import ExpenseKandangsTable from '@/components/pages/expense/form/ExpenseKandangsTable'; import DropFileInput from '@/components/input/DropFileInput'; import ExpenseRequestKandangDetailExpense from '@/components/pages/expense/form/ExpenseRequestKandangDetailExpense'; +import RequirePermission from '@/components/helper/RequirePermission'; import { ExpenseRequestFormSchema, @@ -385,21 +386,23 @@ const ExpenseRequestForm = ({ className={{ wrapper: 'col-span-12' }} /> - + + + {formik.values.existing_documents && formik.values.existing_documents.length > 0 && ( @@ -461,36 +464,40 @@ const ExpenseRequestForm = ({
{type !== 'add' && (
- - - {type !== 'edit' && ( + + + + {type !== 'edit' && ( + + + )}
)}