From 9133a82bef691b70aecd656bac18cdf731d093a6 Mon Sep 17 00:00:00 2001 From: yaely20 <145603125+yaely20@users.noreply.github.com> Date: Thu, 1 Jan 2026 15:39:29 +0000 Subject: [PATCH 1/3] dd TeacherDashboard and useObjectStore util --- client/src/App.jsx | 5 ++- client/src/DashboardPermissions.jsx | 57 +++++++++++++++++++++++++++++ client/src/utils/appPermissions.js | 6 ++- client/src/utils/storeUtil.ts | 26 +++++++++++++ 4 files changed, 91 insertions(+), 3 deletions(-) create mode 100644 client/src/DashboardPermissions.jsx create mode 100644 client/src/utils/storeUtil.ts diff --git a/client/src/App.jsx b/client/src/App.jsx index cd41ee5e..a0371576 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -17,7 +17,8 @@ const appTheme = createTheme({ isRtl: true }); -import { Dashboard, Layout } from 'src/GeneralLayout'; +import { Layout } from 'src/GeneralLayout'; +import { DashboardPermissions} from 'src/DashboardPermissions'; import { resourceEntityGuesser } from '@shared/components/crudContainers/EntityGuesser'; import attReport from "src/entities/att-report"; @@ -107,7 +108,7 @@ const App = () => ( {permissions => { const onlyInLesson = isOnlyInLessonReport(permissions) && !isAdmin(permissions); diff --git a/client/src/DashboardPermissions.jsx b/client/src/DashboardPermissions.jsx new file mode 100644 index 00000000..53bb2c46 --- /dev/null +++ b/client/src/DashboardPermissions.jsx @@ -0,0 +1,57 @@ +import React from 'react'; +import {useDataProvider,SimpleForm,TextInput,useNotify,Toolbar,SaveButton} from 'react-admin'; +import { useObjectStore } from 'src/utils/storeUtil'; +import { Dashboard } from 'src/GeneralLayout'; +import {useIsTeacher} from 'src/utils/appPermissions'; +import Button from '@mui/material/Button'; + +export const DashboardPermissions = (props) => { + const isTeacher = useIsTeacher(); + if (isTeacher) { + return ( + + + + + );} + else { + return ; + } +} + +const TeacherDashboard = ({ children }) => { + const dataProvider = useDataProvider(); + const notify = useNotify(); + const { value: teacher, set: setTeacher, clear } = useObjectStore('teacher'); + if (teacher) { + return
+ שלום המורה {teacher.name} + + {children} +
+ } + + const handleSubmit = async (values) => { + const { tz } = values; + const result = await dataProvider.getList('teacher', { + pagination: { page: 1, perPage: 1 }, + filter: { tz } + }); + const teacher = result.data[0] || null; + if (teacher) { + setTeacher(teacher); + } + else { + notify('Teacher not found', { type: 'warning' }); + return null; + } + }; + + return ( + }> + + +); +} diff --git a/client/src/utils/appPermissions.js b/client/src/utils/appPermissions.js index 8202c44c..2f57b077 100644 --- a/client/src/utils/appPermissions.js +++ b/client/src/utils/appPermissions.js @@ -9,6 +9,7 @@ export const appPermissions = { absCountEffect: 'absCountEffect', lessonSignature: 'lessonSignature', approvedAbsencesBulk: 'approvedAbsencesBulk', + teacher:'teacher', }; export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload); @@ -33,4 +34,7 @@ export const isLessonSignature = (permissions) => isAdmin(permissions) || hasPer export const useIsLessonSignature = () => useHasPermission(appPermissions.lessonSignature); export const isApprovedAbsencesBulk = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.approvedAbsencesBulk); -export const useIsApprovedAbsencesBulk = () => useHasPermission(appPermissions.approvedAbsencesBulk); \ No newline at end of file +export const useIsApprovedAbsencesBulk = () => useHasPermission(appPermissions.approvedAbsencesBulk); + +export const isTeacher = (permissions) => isAdmin(permissions)|| hasPermissionLogic(permissions,appPermissions.teacher); +export const useIsTeacher = () => useHasPermission(appPermissions.teacher); \ No newline at end of file diff --git a/client/src/utils/storeUtil.ts b/client/src/utils/storeUtil.ts new file mode 100644 index 00000000..8a005d13 --- /dev/null +++ b/client/src/utils/storeUtil.ts @@ -0,0 +1,26 @@ +import {useStore } from 'react-admin'; + +export interface ObjectStore { + value: any | null; + set: (value: any) => void; + clear: () => void; +} + +export const useObjectStore = (storeKey: string): ObjectStore => { + const [value, setValue] = useStore(storeKey, null); + + const set = (nextValue: any) => { + setValue(nextValue); + }; + + const clear = () => { + setValue(null); + }; + + return { + value, + set, + clear, + }; +}; + From 5016f7272f0fbce411bef5ed65b9d4afd51fec82 Mon Sep 17 00:00:00 2001 From: yaely20 <145603125+yaely20@users.noreply.github.com> Date: Fri, 2 Jan 2026 00:22:02 +0000 Subject: [PATCH 2/3] code formatting and renaming --- client/src/App.jsx | 9 ++--- ...boardPermissions.jsx => RootDashboard.jsx} | 34 +++++++++++-------- client/src/utils/appPermissions.js | 9 ++--- client/src/utils/storeUtil.ts | 2 +- 4 files changed, 30 insertions(+), 24 deletions(-) rename client/src/{DashboardPermissions.jsx => RootDashboard.jsx} (65%) diff --git a/client/src/App.jsx b/client/src/App.jsx index a0371576..536e88b4 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -18,7 +18,7 @@ const appTheme = createTheme({ }); import { Layout } from 'src/GeneralLayout'; -import { DashboardPermissions} from 'src/DashboardPermissions'; +import { RootDashboard } from 'src/RootDashboard'; import { resourceEntityGuesser } from '@shared/components/crudContainers/EntityGuesser'; import attReport from "src/entities/att-report"; @@ -60,7 +60,7 @@ import paymentTrack from '@shared/components/common-entities/payment-track'; import yemotCall from '@shared/components/common-entities/yemot-call'; import { isShowUsersData, isEditPagesData, isEditPaymentTracksData, isAdmin } from "@shared/utils/permissionsUtil"; -import { isLessonSignature, isOnlyInLessonReport } from 'src/utils/appPermissions'; +import { isLessonSignature, isOnlyInLessonReport, isTeacherView } from 'src/utils/appPermissions'; import YemotSimulator from "@shared/components/views/YemotSimulator"; import { RegisterPage } from '@shared/components/layout/RegisterPage'; import { LoginPage } from '@shared/components/layout/LoginPage'; @@ -108,11 +108,12 @@ const App = () => ( {permissions => { const onlyInLesson = isOnlyInLessonReport(permissions) && !isAdmin(permissions); - if (onlyInLesson) { + const teacherView = isTeacherView(permissions) && !isAdmin(permissions); + if (onlyInLesson || teacherView) { return ( <> diff --git a/client/src/DashboardPermissions.jsx b/client/src/RootDashboard.jsx similarity index 65% rename from client/src/DashboardPermissions.jsx rename to client/src/RootDashboard.jsx index 53bb2c46..2dbd5f0b 100644 --- a/client/src/DashboardPermissions.jsx +++ b/client/src/RootDashboard.jsx @@ -1,17 +1,17 @@ import React from 'react'; -import {useDataProvider,SimpleForm,TextInput,useNotify,Toolbar,SaveButton} from 'react-admin'; +import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar ,SaveButton } from 'react-admin'; import { useObjectStore } from 'src/utils/storeUtil'; import { Dashboard } from 'src/GeneralLayout'; -import {useIsTeacher} from 'src/utils/appPermissions'; +import { useIsTeacherView } from 'src/utils/appPermissions'; import Button from '@mui/material/Button'; -export const DashboardPermissions = (props) => { - const isTeacher = useIsTeacher(); - if (isTeacher) { +export const RootDashboard = (props) => { + const isTeacherView = useIsTeacherView(); + if (isTeacherView) { return ( - + - + );} else { @@ -19,16 +19,17 @@ export const DashboardPermissions = (props) => { } } -const TeacherDashboard = ({ children }) => { +const TeacherGuard = ({ children }) => { const dataProvider = useDataProvider(); const notify = useNotify(); const { value: teacher, set: setTeacher, clear } = useObjectStore('teacher'); + if (teacher) { - return
+ return
שלום המורה {teacher.name} + התנתק + {children}
} @@ -40,18 +41,21 @@ const TeacherDashboard = ({ children }) => { filter: { tz } }); const teacher = result.data[0] || null; + if (teacher) { setTeacher(teacher); } else { notify('Teacher not found', { type: 'warning' }); - return null; } }; return ( - }> + + + }> - -); + + ); } diff --git a/client/src/utils/appPermissions.js b/client/src/utils/appPermissions.js index 2f57b077..e5ccc057 100644 --- a/client/src/utils/appPermissions.js +++ b/client/src/utils/appPermissions.js @@ -1,4 +1,4 @@ -import { useHasPermission, hasPermissionLogic, isAdmin } from '@shared/utils/permissionsUtil'; +import { useHasPermission, hasPermissionLogic, isAdmin } from '@shared/utils/permissionsUtil'; export const appPermissions = { scannerUpload: 'scannerUpload', @@ -9,7 +9,7 @@ export const appPermissions = { absCountEffect: 'absCountEffect', lessonSignature: 'lessonSignature', approvedAbsencesBulk: 'approvedAbsencesBulk', - teacher:'teacher', + teacherView:'teacherView', }; export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload); @@ -36,5 +36,6 @@ export const useIsLessonSignature = () => useHasPermission(appPermissions.lesson export const isApprovedAbsencesBulk = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.approvedAbsencesBulk); export const useIsApprovedAbsencesBulk = () => useHasPermission(appPermissions.approvedAbsencesBulk); -export const isTeacher = (permissions) => isAdmin(permissions)|| hasPermissionLogic(permissions,appPermissions.teacher); -export const useIsTeacher = () => useHasPermission(appPermissions.teacher); \ No newline at end of file +export const isTeacherView = (permissions) => isAdmin(permissions)|| hasPermissionLogic(permissions,appPermissions.teacherView); +export const useIsTeacherView = () => useHasPermission(appPermissions.teacherView); + diff --git a/client/src/utils/storeUtil.ts b/client/src/utils/storeUtil.ts index 8a005d13..f6084c0c 100644 --- a/client/src/utils/storeUtil.ts +++ b/client/src/utils/storeUtil.ts @@ -1,4 +1,4 @@ -import {useStore } from 'react-admin'; +import { useStore } from 'react-admin'; export interface ObjectStore { value: any | null; From f07fafc05195eabdb79af38a48bfac289f93cef8 Mon Sep 17 00:00:00 2001 From: yaely20 <145603125+yaely20@users.noreply.github.com> Date: Fri, 2 Jan 2026 09:21:49 +0000 Subject: [PATCH 3/3] use format --- client/src/RootDashboard.jsx | 27 ++++++++++++++------------- client/src/utils/appPermissions.js | 6 +++--- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/client/src/RootDashboard.jsx b/client/src/RootDashboard.jsx index 2dbd5f0b..e366cb9b 100644 --- a/client/src/RootDashboard.jsx +++ b/client/src/RootDashboard.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar ,SaveButton } from 'react-admin'; +import { useDataProvider, SimpleForm, TextInput, useNotify, Toolbar, SaveButton } from 'react-admin'; import { useObjectStore } from 'src/utils/storeUtil'; import { Dashboard } from 'src/GeneralLayout'; import { useIsTeacherView } from 'src/utils/appPermissions'; @@ -12,10 +12,11 @@ export const RootDashboard = (props) => { - - );} + + ); + } else { - return ; + return ; } } @@ -38,24 +39,24 @@ const TeacherGuard = ({ children }) => { const { tz } = values; const result = await dataProvider.getList('teacher', { pagination: { page: 1, perPage: 1 }, - filter: { tz } + filter: { tz } }); const teacher = result.data[0] || null; if (teacher) { setTeacher(teacher); - } + } else { - notify('Teacher not found', { type: 'warning' }); + notify('Teacher not found', { type: 'warning' }); } - }; - + }; + return ( - - }> + toolbar={ + + }> - + ); } diff --git a/client/src/utils/appPermissions.js b/client/src/utils/appPermissions.js index e5ccc057..6f62e0c7 100644 --- a/client/src/utils/appPermissions.js +++ b/client/src/utils/appPermissions.js @@ -1,4 +1,4 @@ -import { useHasPermission, hasPermissionLogic, isAdmin } from '@shared/utils/permissionsUtil'; +import { useHasPermission, hasPermissionLogic, isAdmin } from '@shared/utils/permissionsUtil'; export const appPermissions = { scannerUpload: 'scannerUpload', @@ -9,7 +9,7 @@ export const appPermissions = { absCountEffect: 'absCountEffect', lessonSignature: 'lessonSignature', approvedAbsencesBulk: 'approvedAbsencesBulk', - teacherView:'teacherView', + teacherView: 'teacherView', }; export const isScannerUpload = (permissions) => hasPermissionLogic(permissions, appPermissions.scannerUpload); @@ -36,6 +36,6 @@ export const useIsLessonSignature = () => useHasPermission(appPermissions.lesson export const isApprovedAbsencesBulk = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.approvedAbsencesBulk); export const useIsApprovedAbsencesBulk = () => useHasPermission(appPermissions.approvedAbsencesBulk); -export const isTeacherView = (permissions) => isAdmin(permissions)|| hasPermissionLogic(permissions,appPermissions.teacherView); +export const isTeacherView = (permissions) => isAdmin(permissions) || hasPermissionLogic(permissions, appPermissions.teacherView); export const useIsTeacherView = () => useHasPermission(appPermissions.teacherView);