From 7e0a532419704bd41f12c0525f0cfcdc4d67c51c Mon Sep 17 00:00:00 2001 From: yaely20 <145603125+yaely20@users.noreply.github.com> Date: Tue, 30 Dec 2025 21:58:22 +0000 Subject: [PATCH 1/2] change permmision ApproveAbsences --- client/src/components/BulkApproveAbsences.jsx | 7 ++++--- client/src/utils/appPermissions.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/src/components/BulkApproveAbsences.jsx b/client/src/components/BulkApproveAbsences.jsx index 2b57705d..0f7411d5 100644 --- a/client/src/components/BulkApproveAbsences.jsx +++ b/client/src/components/BulkApproveAbsences.jsx @@ -2,14 +2,15 @@ import { useDataProvider, useNotify, useResourceContext, useRefresh, SimpleForm, import { ActionOrDialogButton } from '@shared/components/crudContainers/ActionOrDialogButton'; import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput'; import { handleActionSuccess, handleError } from '@shared/utils/notifyUtil'; -import { isApprovedAbsencesBulk } from 'src/utils/appPermissions'; +import { useIsApprovedAbsencesBulk, isApprovedAbsencesBulk } from 'src/utils/appPermissions'; -export const BulkApproveAbsences = ({ label, name, permissions }) => { +export const BulkApproveAbsences = ({ label, name }) => { const dataProvider = useDataProvider(); const resource = useResourceContext(); const refresh = useRefresh(); const notify = useNotify(); - if (!isApprovedAbsencesBulk(permissions)) return null; + const canBulkApproveAbsences = useIsApprovedAbsencesBulk(); + if (!isApprovedAbsencesBulk(canBulkApproveAbsences)) return null; const handleSave = async (values, onClose) => { const payload = values.approvedAbsences.map(row => ({ diff --git a/client/src/utils/appPermissions.js b/client/src/utils/appPermissions.js index b98c9168..8202c44c 100644 --- a/client/src/utils/appPermissions.js +++ b/client/src/utils/appPermissions.js @@ -8,7 +8,7 @@ export const appPermissions = { inLessonReportStartWithTeacher: 'inLessonReport.startWithTeacher', absCountEffect: 'absCountEffect', lessonSignature: 'lessonSignature', - approvedAbsencesBulk:'approvedAbsencesBulk' + approvedAbsencesBulk: 'approvedAbsencesBulk', }; export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload); From da73bc84651c0de2aedd38b0153c42af08884703 Mon Sep 17 00:00:00 2001 From: yaely20 <145603125+yaely20@users.noreply.github.com> Date: Tue, 30 Dec 2025 22:00:37 +0000 Subject: [PATCH 2/2] ApproveAbsences two --- client/src/components/BulkApproveAbsences.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/components/BulkApproveAbsences.jsx b/client/src/components/BulkApproveAbsences.jsx index 0f7411d5..adbe4303 100644 --- a/client/src/components/BulkApproveAbsences.jsx +++ b/client/src/components/BulkApproveAbsences.jsx @@ -2,7 +2,7 @@ import { useDataProvider, useNotify, useResourceContext, useRefresh, SimpleForm, import { ActionOrDialogButton } from '@shared/components/crudContainers/ActionOrDialogButton'; import CommonReferenceInput from '@shared/components/fields/CommonReferenceInput'; import { handleActionSuccess, handleError } from '@shared/utils/notifyUtil'; -import { useIsApprovedAbsencesBulk, isApprovedAbsencesBulk } from 'src/utils/appPermissions'; +import { useIsApprovedAbsencesBulk } from 'src/utils/appPermissions'; export const BulkApproveAbsences = ({ label, name }) => { const dataProvider = useDataProvider(); @@ -10,7 +10,7 @@ export const BulkApproveAbsences = ({ label, name }) => { const refresh = useRefresh(); const notify = useNotify(); const canBulkApproveAbsences = useIsApprovedAbsencesBulk(); - if (!isApprovedAbsencesBulk(canBulkApproveAbsences)) return null; + if (!canBulkApproveAbsences) return null; const handleSave = async (values, onClose) => { const payload = values.approvedAbsences.map(row => ({