Skip to content

Commit 6ff00bc

Browse files
committed
Merge branch 'claude/invalid-param-id-error-2k11tg'
Fix client-side routing race that let /student/student-attendance-by-klass fall through to the student resource's /:id edit route, causing 400 "Invalid param id" errors from the server. Also gate the menu item on the studentAttendanceByKlass permission and show AccessDenied for unauthorized direct access. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Vw5gEYMT7DHEBnjbWNTUpq
2 parents c36fabc + b57868f commit 6ff00bc

3 files changed

Lines changed: 17 additions & 6 deletions

File tree

‎client/src/App.jsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ import {
6161
isAbsenceType,
6262
isLessonSchedule,
6363
isStudentView,
64-
isStudentAttendanceByKlass,
6564
} from 'src/utils/appPermissions';
6665
import ScannerUpload from '@shared/components/views/ScannerUpload';
6766
import InLessonReport from 'src/reports/InLessonReport';
@@ -168,9 +167,7 @@ const App = () => (
168167
)}
169168
<Resource name="student" {...student} options={{ menuGroup: 'data' }} icon={PortraitIcon}>
170169
<Route path="student-attendance" element={<StudentAttendanceList />} />
171-
{isStudentAttendanceByKlass(permissions) && (
172-
<Route path="student-attendance-by-klass" element={<StudentAttendanceByKlassList />} />
173-
)}
170+
<Route path="student-attendance-by-klass" element={<StudentAttendanceByKlassList />} />
174171
</Resource>
175172
<Resource
176173
name="student_klass"

‎client/src/GeneralLayout.jsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
isOnlyInLessonReport,
2727
isTeacherView,
2828
isStudentView,
29+
isStudentAttendanceByKlass,
2930
} from './utils/appPermissions';
3031
import { useDashboardItems } from './settings/settingsUtil';
3132

@@ -132,7 +133,8 @@ const menuGroups = [
132133
/>
133134
),
134135
({ permissions }) =>
135-
!isTeacherView(permissions) && (
136+
!isTeacherView(permissions) &&
137+
isStudentAttendanceByKlass(permissions) && (
136138
<MenuItemLink
137139
key="student-attendance-by-klass"
138140
to="/student/student-attendance-by-klass"

‎client/src/pivots/StudentAttendanceByKlassList.jsx‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
filterByUserIdAndYear,
77
} from '@shared/components/fields/CommonReferenceInputFilter';
88
import {
9+
AccessDenied,
910
BooleanField,
1011
ReferenceField,
1112
TextField,
@@ -22,6 +23,7 @@ import CommonReferenceArrayInput from '@shared/components/fields/CommonReference
2223
import { adminUserFilter } from '@shared/components/fields/PermissionFilter';
2324
import ThresholdColorField from 'src/components/fields/ThresholdColorField';
2425
import { ABSENCE_THRESHOLDS } from 'src/utils/absenceThresholds';
26+
import { useIsStudentAttendanceByKlass } from 'src/utils/appPermissions';
2527

2628
const filters = [
2729
adminUserFilter,
@@ -126,4 +128,14 @@ const entity = {
126128
configurable: false,
127129
};
128130

129-
export default getResourceComponents(entity).list;
131+
const List = getResourceComponents(entity).list;
132+
133+
const StudentAttendanceByKlassList = (props) => {
134+
const hasPermission = useIsStudentAttendanceByKlass();
135+
if (!hasPermission) {
136+
return <AccessDenied />;
137+
}
138+
return <List {...props} />;
139+
};
140+
141+
export default StudentAttendanceByKlassList;

0 commit comments

Comments
 (0)