From 5489dbf3276e6161aa0008ebc785e3933114f148 Mon Sep 17 00:00:00 2001 From: Lixian Zhou Date: Wed, 11 Mar 2026 11:43:27 -0400 Subject: [PATCH] patch --- .../center-calendar/CenterCalendar.js | 2 +- .../event-request/CreateEventRequest.js | 2 +- .../event-request/EventRequestList.js | 2 +- client/src/components/events/CreateEvent.js | 2 +- client/src/components/events/EventsCalendar.js | 2 +- client/src/components/events/EventsList.js | 2 +- .../components/events/EventsMultipleList.js | 2 +- client/src/components/events/UpdateEvent.js | 2 +- client/src/components/events/ViewEvent.js | 2 +- client/src/components/home/menu.js | 2 +- .../src/components/info-screen/InfoScreen.js | 2 +- client/src/components/medical/Medical.js | 2 +- client/src/components/medical/MedicalIndex.js | 2 +- .../src/components/medical/TemplateManager.js | 2 +- .../src/components/resources/CreateResource.js | 2 +- .../src/components/resources/ResourcesList.js | 2 +- .../src/components/resources/UpdateResource.js | 2 +- .../src/components/resources/ViewResource.js | 2 +- .../trans-routes/DailyTemplatesList.js | 2 +- client/src/services/AuthService.js | 18 ++++++++++++++++++ 20 files changed, 37 insertions(+), 19 deletions(-) diff --git a/client/src/components/center-calendar/CenterCalendar.js b/client/src/components/center-calendar/CenterCalendar.js index 6a99c9a..fd43078 100644 --- a/client/src/components/center-calendar/CenterCalendar.js +++ b/client/src/components/center-calendar/CenterCalendar.js @@ -316,7 +316,7 @@ const EventsCalendar = () => { useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewCalendar()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/event-request/CreateEventRequest.js b/client/src/components/event-request/CreateEventRequest.js index ca2b096..03c3164 100644 --- a/client/src/components/event-request/CreateEventRequest.js +++ b/client/src/components/event-request/CreateEventRequest.js @@ -83,7 +83,7 @@ const CreateEventRequest = () => { useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalSection()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/event-request/EventRequestList.js b/client/src/components/event-request/EventRequestList.js index 23902d7..91d3283 100644 --- a/client/src/components/event-request/EventRequestList.js +++ b/client/src/components/event-request/EventRequestList.js @@ -69,7 +69,7 @@ const EventRequestList = () => { ]); useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalSection()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/events/CreateEvent.js b/client/src/components/events/CreateEvent.js index b717034..357b2f1 100644 --- a/client/src/components/events/CreateEvent.js +++ b/client/src/components/events/CreateEvent.js @@ -134,7 +134,7 @@ const CreateEvent = () => { useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canEditMedicalEvents()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/events/EventsCalendar.js b/client/src/components/events/EventsCalendar.js index 0763549..27cf3ad 100644 --- a/client/src/components/events/EventsCalendar.js +++ b/client/src/components/events/EventsCalendar.js @@ -152,7 +152,7 @@ const EventsCalendar = () => { useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalEvents()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/events/EventsList.js b/client/src/components/events/EventsList.js index a28a087..0972255 100644 --- a/client/src/components/events/EventsList.js +++ b/client/src/components/events/EventsList.js @@ -137,7 +137,7 @@ const EventsList = () => { }; useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalEvents()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/events/EventsMultipleList.js b/client/src/components/events/EventsMultipleList.js index 4201a18..226d65a 100644 --- a/client/src/components/events/EventsMultipleList.js +++ b/client/src/components/events/EventsMultipleList.js @@ -96,7 +96,7 @@ const EventsMultipleList = () => { }; useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalEvents()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/events/UpdateEvent.js b/client/src/components/events/UpdateEvent.js index feacdf9..03eccd8 100644 --- a/client/src/components/events/UpdateEvent.js +++ b/client/src/components/events/UpdateEvent.js @@ -200,7 +200,7 @@ const UpdateEvent = () => { useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canEditMedicalEvents()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/events/ViewEvent.js b/client/src/components/events/ViewEvent.js index 144666e..6254b98 100644 --- a/client/src/components/events/ViewEvent.js +++ b/client/src/components/events/ViewEvent.js @@ -27,7 +27,7 @@ const ViewEvent = () => { } useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalEvents()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/home/menu.js b/client/src/components/home/menu.js index 271edde..4002ccf 100644 --- a/client/src/components/home/menu.js +++ b/client/src/components/home/menu.js @@ -145,7 +145,7 @@ const SideMenu = () => { name: 'Appointment One-Day List', link: '/medical/events/list', category: '/events/list', - roleFunc: AuthService.canAccessLegacySystem + roleFunc: AuthService.canViewMedicalEvents }, // { // name: 'Customer Report', diff --git a/client/src/components/info-screen/InfoScreen.js b/client/src/components/info-screen/InfoScreen.js index eabe38f..31bb1a8 100644 --- a/client/src/components/info-screen/InfoScreen.js +++ b/client/src/components/info-screen/InfoScreen.js @@ -115,7 +115,7 @@ const InfoScreen = () => { } useEffect(() => { - if (!AuthService.canViewRoutes()) { + if (!AuthService.canViewInfoScreen()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.'); AuthService.logout(); navigate('/login'); diff --git a/client/src/components/medical/Medical.js b/client/src/components/medical/Medical.js index 4624669..56746a0 100644 --- a/client/src/components/medical/Medical.js +++ b/client/src/components/medical/Medical.js @@ -69,7 +69,7 @@ const Medical = () => { } useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalSection() && !AuthService.canViewMedicalEvents()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); diff --git a/client/src/components/medical/MedicalIndex.js b/client/src/components/medical/MedicalIndex.js index fcbff29..07e9040 100644 --- a/client/src/components/medical/MedicalIndex.js +++ b/client/src/components/medical/MedicalIndex.js @@ -73,7 +73,7 @@ const MedicalIndex = () => { } useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalSection() && !AuthService.canViewMedicalEvents()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); diff --git a/client/src/components/medical/TemplateManager.js b/client/src/components/medical/TemplateManager.js index 8e672f5..eeb9545 100644 --- a/client/src/components/medical/TemplateManager.js +++ b/client/src/components/medical/TemplateManager.js @@ -22,7 +22,7 @@ const TemplateManager = () => { }; useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalSection()) { window.alert("You haven't login yet OR this user does not have access to this page. Please change an admin account to login."); AuthService.logout(); navigate("/login"); diff --git a/client/src/components/resources/CreateResource.js b/client/src/components/resources/CreateResource.js index 5c4b70a..ce82cc1 100644 --- a/client/src/components/resources/CreateResource.js +++ b/client/src/components/resources/CreateResource.js @@ -110,7 +110,7 @@ const CreateResource = () => { }; useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalSection()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/resources/ResourcesList.js b/client/src/components/resources/ResourcesList.js index 4f3a32f..48d0b36 100644 --- a/client/src/components/resources/ResourcesList.js +++ b/client/src/components/resources/ResourcesList.js @@ -62,7 +62,7 @@ const ResourcesList = () => { } ]); useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalSection()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/resources/UpdateResource.js b/client/src/components/resources/UpdateResource.js index 1d0ffdc..124a326 100644 --- a/client/src/components/resources/UpdateResource.js +++ b/client/src/components/resources/UpdateResource.js @@ -132,7 +132,7 @@ const UpdateResource = () => { } useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalSection()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/resources/ViewResource.js b/client/src/components/resources/ViewResource.js index 4c98892..6a7aa00 100644 --- a/client/src/components/resources/ViewResource.js +++ b/client/src/components/resources/ViewResource.js @@ -49,7 +49,7 @@ const ViewResource = () => { } useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewMedicalSection()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/components/trans-routes/DailyTemplatesList.js b/client/src/components/trans-routes/DailyTemplatesList.js index 029b9dd..e67440f 100644 --- a/client/src/components/trans-routes/DailyTemplatesList.js +++ b/client/src/components/trans-routes/DailyTemplatesList.js @@ -55,7 +55,7 @@ const DailyTemplatesList = () => { ]; useEffect(() => { - if (!AuthService.canAccessLegacySystem()) { + if (!AuthService.canViewRoutes()) { window.alert('You haven\'t login yet OR this user does not have access to this page. Please change an admin account to login.') AuthService.logout(); navigate(`/login`); diff --git a/client/src/services/AuthService.js b/client/src/services/AuthService.js index 2c551e7..03dd3b0 100644 --- a/client/src/services/AuthService.js +++ b/client/src/services/AuthService.js @@ -89,6 +89,22 @@ const canViewMedicalSection = () => { ]); } +const canViewMedicalEvents = () => { + return hasAnyPermission([ + 'View _Calendar _Medical Appointment', + 'Edit&Create _Calendar _Medical Appointment', + 'View_Appointment Calendar', + 'Edit & Create_Appointment Calendar' + ]); +} + +const canEditMedicalEvents = () => { + return hasAnyPermission([ + 'Edit&Create _Calendar _Medical Appointment', + 'Edit & Create_Appointment Calendar' + ]); +} + const canViewMealStatus = () => { return hasAnyPermission([ 'View_Meal Status', @@ -291,6 +307,8 @@ export const AuthService = { canViewCalendar, canViewMessaging, canViewMedicalSection, + canViewMedicalEvents, + canEditMedicalEvents, canViewMealStatus, canViewSeatingChart, canViewLobby,