From 0fcd2d7d3f6fbd00710de79f7c112d9da951e0db Mon Sep 17 00:00:00 2001 From: Claude Date: Wed, 28 Oct 2026 10:19:11 +0000 Subject: [PATCH 1/2] fix(teacher-view): remove grade form from teacher view Saving grades from the teacher view redirected to /grade, which is not a resource in that view, so teachers landed on a not-found page. Hide the grade form menu item and drop its route for teacher-view users. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012GTicq4LVmQQte9gifqSvU --- client/src/App.jsx | 9 --------- client/src/GeneralLayout.jsx | 3 ++- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/client/src/App.jsx b/client/src/App.jsx index 2d4414a0..ff478ad0 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -142,15 +142,6 @@ const App = () => ( } /> - - {' '} - {' '} - - } - /> } /> } /> } /> diff --git a/client/src/GeneralLayout.jsx b/client/src/GeneralLayout.jsx index b495b45b..d73f3faf 100644 --- a/client/src/GeneralLayout.jsx +++ b/client/src/GeneralLayout.jsx @@ -80,7 +80,8 @@ const customMenuItems = [ /> ), ({ permissions }) => - shouldShowLessonReports(permissions) && ( + shouldShowLessonReports(permissions) && + !isTeacherView(permissions) && ( Date: Wed, 28 Oct 2026 11:51:11 +0000 Subject: [PATCH 2/2] fix(att-report): resolve klass join before nested klass.klassType filter The lead teacher report filters on klass.klassType.teacherReferenceId. BaseEntityService validates filter fields before crud sets up joins, so crud cached the nested klass.klassType relation without a join path (its parent klass was not resolved yet) and the request failed with a 500. Resolve klass first in the att_report_with_report_month service. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_012GTicq4LVmQQte9gifqSvU --- ...tt-report-with-report-month.config.spec.ts | 21 +++++++++++++++++++ .../att-report-with-report-month.config.ts | 11 +++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/server/src/entity-modules/__tests__/att-report-with-report-month.config.spec.ts b/server/src/entity-modules/__tests__/att-report-with-report-month.config.spec.ts index 6ced40f1..131605d7 100644 --- a/server/src/entity-modules/__tests__/att-report-with-report-month.config.spec.ts +++ b/server/src/entity-modules/__tests__/att-report-with-report-month.config.spec.ts @@ -7,6 +7,8 @@ import { AttReport } from 'src/db/entities/AttReport.entity'; const mockBaseCreateOne = jest.fn().mockResolvedValue({ id: 1 }); const mockBaseCreateMany = jest.fn().mockResolvedValue([{ id: 1 }]); const mockBaseConstructor = jest.fn(); +const mockGetRelationMetadata = jest.fn(); +const mockBaseCreateBuilder = jest.fn().mockResolvedValue('builder'); jest.mock('@shared/base-entity/base-entity.service', () => { class MockBaseEntityService { @@ -32,6 +34,12 @@ jest.mock('@shared/base-entity/base-entity.service', () => { async doAction(req: any, body: any) { return 'success'; } + getRelationMetadata(field: string, options: any) { + return mockGetRelationMetadata(field, options); + } + async createBuilder(parsed: any, options: any, many: boolean, withDeleted: boolean) { + return mockBaseCreateBuilder(parsed, options, many, withDeleted); + } } return { BaseEntityService: MockBaseEntityService, @@ -89,6 +97,19 @@ describe('att-report-with-report-month.config', () => { (BaseEntityService as unknown as jest.Mock).mockClear?.(); }); + it('createBuilder should resolve the klass relation before the nested klass.klassType filter', async () => { + const options = { query: { join: config.query.join } }; + const parsed = { filter: [{ field: 'klass.klassType.teacherReferenceId', operator: '$eq', value: 1 }] }; + + await expect(service.createBuilder(parsed, options)).resolves.toBe('builder'); + + expect(mockGetRelationMetadata).toHaveBeenCalledWith('klass', { eager: false }); + expect(mockGetRelationMetadata.mock.invocationCallOrder[0]).toBeLessThan( + mockBaseCreateBuilder.mock.invocationCallOrder[0], + ); + expect(mockBaseCreateBuilder).toHaveBeenCalledWith(parsed, options, true, false); + }); + it('createOne should delegate to AttReport service', async () => { const req = { options: {}, parsed: {} } as any; const dto = { reportDate: '2022-01-01' }; diff --git a/server/src/entity-modules/att-report-with-report-month.config.ts b/server/src/entity-modules/att-report-with-report-month.config.ts index 05c92f25..efadfe25 100644 --- a/server/src/entity-modules/att-report-with-report-month.config.ts +++ b/server/src/entity-modules/att-report-with-report-month.config.ts @@ -1,4 +1,5 @@ -import { CrudRequest, Override, CreateManyDto } from '@dataui/crud'; +import { CrudRequest, CrudRequestOptions, Override, CreateManyDto } from '@dataui/crud'; +import { ParsedRequestParams } from '@dataui/crud-request'; import { In, DeepPartial } from 'typeorm'; import { BaseEntityModuleOptions, Entity } from '@shared/base-entity/interface'; import { IHeader } from '@shared/utils/exporter/types'; @@ -83,6 +84,14 @@ class AttReportWithReportMonthService, dto: DeepPartial): Promise { const attReportService = this.getAttReportService();