From 0c28fcaeca3bfb3d324fea223abc96266b010f4b Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 19 Jul 2026 19:22:09 +0000 Subject: [PATCH 1/4] Exclude signatureData from report_group CRUD reads signatureData stores a base64 image and was being pulled on every list/getOne request even though the datagrid never renders it, bloating list responses. Excluding it from the CRUD select doesn't affect writes (create/update, bulk updateSignatureData) or the lessonSignaturePdf report, which fetch it via direct repository queries outside the CRUD builder. --- server/src/entity-modules/report-group.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/entity-modules/report-group.config.ts b/server/src/entity-modules/report-group.config.ts index 945cf7b4..6318e39e 100644 --- a/server/src/entity-modules/report-group.config.ts +++ b/server/src/entity-modules/report-group.config.ts @@ -66,6 +66,7 @@ function getConfig(): BaseEntityModuleOptions { entity: ReportGroup, service: ReportGroupService, query: { + exclude: ['signatureData'], join: { teacher: { eager: false }, lesson: { eager: false }, From 2543df35a787d82043ac20f0325fcde5a6efc36d Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 19 Jul 2026 19:54:51 +0000 Subject: [PATCH 2/4] Switch report generators to self-hosted fonts, drop Google Fonts fetch reportGroupSessionsSummary, studentReportCardReact and lessonSignaturePdfReport all pulled a fonts.googleapis.com into their PDF markup, waited networkidle0 on it in Puppeteer, and hung for the full 30s navigation timeout when that host wasn't reachable - confirmed as the cause of the sessionsSummary report failures. Points at nra-server's new self-hosted @font-face bundle (useFontFaceCss) instead of the old useFontLinks, so PDF generation no longer depends on live network access at all. Bumps server/shared to buzz-code/nra-server@a4f252b. --- server/shared | 2 +- server/src/reports/lessonSignaturePdfReport.tsx | 6 +++--- server/src/reports/reportGroupSessionsSummary.tsx | 8 ++++---- server/src/reports/studentReportCardReact.tsx | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/shared b/server/shared index edd1b1fb..a4f252b7 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit edd1b1fb82f70cccfb7b73ccd9af4a0da49603bc +Subproject commit a4f252b71e6f50eac8f16b159780e6d5ff308c01 diff --git a/server/src/reports/lessonSignaturePdfReport.tsx b/server/src/reports/lessonSignaturePdfReport.tsx index b20ae5cb..4f2dc2d9 100644 --- a/server/src/reports/lessonSignaturePdfReport.tsx +++ b/server/src/reports/lessonSignaturePdfReport.tsx @@ -10,7 +10,7 @@ import { Teacher } from 'src/db/entities/Teacher.entity'; import { Lesson } from 'src/db/entities/Lesson.entity'; import { Klass } from 'src/db/entities/Klass.entity'; import { convertToReactStyle, ReportStyles } from '@shared/utils/report/react-user-styles/reportStyles'; -import { wrapWithStyles, useStyles, useFontLinks } from '@shared/utils/report/react-user-styles/StylesContext'; +import { wrapWithStyles, useStyles, useFontFaceCss } from '@shared/utils/report/react-user-styles/StylesContext'; import { IGetReportDataFunction } from '@shared/utils/report/report.generators'; import { ReactToPdfReportGenerator } from '@shared/utils/report/react-to-pdf.generator'; import { formatTime } from '@shared/utils/formatting/formatter.util'; @@ -370,7 +370,7 @@ interface HtmlDocumentProps { } const HtmlDocument: React.FC = ({ title, children }) => { - const fontLinks = useFontLinks(); + const fontFaceCss = useFontFaceCss(); const containerStyle: React.CSSProperties = { ...convertToReactStyle(useStyles(ReportElementType.DOCUMENT)), @@ -383,7 +383,7 @@ const HtmlDocument: React.FC = ({ title, children }) => { {title} - {fontLinks.map((link, index) => ())} +
diff --git a/server/src/reports/reportGroupSessionsSummary.tsx b/server/src/reports/reportGroupSessionsSummary.tsx index 2caa4c5e..ed1b728d 100644 --- a/server/src/reports/reportGroupSessionsSummary.tsx +++ b/server/src/reports/reportGroupSessionsSummary.tsx @@ -8,7 +8,7 @@ import { formatDate, formatDisplayName } from '@shared/utils/formatting/formatte import { IGetReportDataFunction } from '@shared/utils/report/report.generators'; import { ReactToPdfReportGenerator } from '@shared/utils/report/react-to-pdf.generator'; import { convertToReactStyle, ReportStyles } from '@shared/utils/report/react-user-styles/reportStyles'; -import { wrapWithStyles, useStyles, useFontLinks } from '@shared/utils/report/react-user-styles/StylesContext'; +import { wrapWithStyles, useStyles, useFontFaceCss } from '@shared/utils/report/react-user-styles/StylesContext'; // Define report element types for styling enum ReportElementType { @@ -152,14 +152,14 @@ interface HtmlDocumentProps { } const HtmlDocument: React.FC = ({ title, children }) => { - const fontLinks = useFontLinks(); - + const fontFaceCss = useFontFaceCss(); + return ( {title} - {fontLinks.map((link, index) => ())} +
From c5b74ac15c14b8b13d44b510db22f84ec864370d Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 19 Jul 2026 20:03:11 +0000 Subject: [PATCH 3/4] Revert report generators to fetching fonts from Google for now Holding off on self-hosted fonts. Reports go back to useFontLinks against fonts.googleapis.com. The fix that actually matters for the timeout bug stays in nra-server's markup-to-pdf.generator.ts: 10s timeout instead of 30s, with a no-network-wait fallback render. Bumps server/shared to buzz-code/nra-server@0f837a2. --- server/shared | 2 +- server/src/reports/lessonSignaturePdfReport.tsx | 6 +++--- server/src/reports/reportGroupSessionsSummary.tsx | 8 ++++---- server/src/reports/studentReportCardReact.tsx | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/shared b/server/shared index a4f252b7..0f837a20 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit a4f252b71e6f50eac8f16b159780e6d5ff308c01 +Subproject commit 0f837a20a05596532be22f8473447198257a93f2 diff --git a/server/src/reports/lessonSignaturePdfReport.tsx b/server/src/reports/lessonSignaturePdfReport.tsx index 4f2dc2d9..b20ae5cb 100644 --- a/server/src/reports/lessonSignaturePdfReport.tsx +++ b/server/src/reports/lessonSignaturePdfReport.tsx @@ -10,7 +10,7 @@ import { Teacher } from 'src/db/entities/Teacher.entity'; import { Lesson } from 'src/db/entities/Lesson.entity'; import { Klass } from 'src/db/entities/Klass.entity'; import { convertToReactStyle, ReportStyles } from '@shared/utils/report/react-user-styles/reportStyles'; -import { wrapWithStyles, useStyles, useFontFaceCss } from '@shared/utils/report/react-user-styles/StylesContext'; +import { wrapWithStyles, useStyles, useFontLinks } from '@shared/utils/report/react-user-styles/StylesContext'; import { IGetReportDataFunction } from '@shared/utils/report/report.generators'; import { ReactToPdfReportGenerator } from '@shared/utils/report/react-to-pdf.generator'; import { formatTime } from '@shared/utils/formatting/formatter.util'; @@ -370,7 +370,7 @@ interface HtmlDocumentProps { } const HtmlDocument: React.FC = ({ title, children }) => { - const fontFaceCss = useFontFaceCss(); + const fontLinks = useFontLinks(); const containerStyle: React.CSSProperties = { ...convertToReactStyle(useStyles(ReportElementType.DOCUMENT)), @@ -383,7 +383,7 @@ const HtmlDocument: React.FC = ({ title, children }) => { {title} - + {fontLinks.map((link, index) => ())}
diff --git a/server/src/reports/reportGroupSessionsSummary.tsx b/server/src/reports/reportGroupSessionsSummary.tsx index ed1b728d..2caa4c5e 100644 --- a/server/src/reports/reportGroupSessionsSummary.tsx +++ b/server/src/reports/reportGroupSessionsSummary.tsx @@ -8,7 +8,7 @@ import { formatDate, formatDisplayName } from '@shared/utils/formatting/formatte import { IGetReportDataFunction } from '@shared/utils/report/report.generators'; import { ReactToPdfReportGenerator } from '@shared/utils/report/react-to-pdf.generator'; import { convertToReactStyle, ReportStyles } from '@shared/utils/report/react-user-styles/reportStyles'; -import { wrapWithStyles, useStyles, useFontFaceCss } from '@shared/utils/report/react-user-styles/StylesContext'; +import { wrapWithStyles, useStyles, useFontLinks } from '@shared/utils/report/react-user-styles/StylesContext'; // Define report element types for styling enum ReportElementType { @@ -152,14 +152,14 @@ interface HtmlDocumentProps { } const HtmlDocument: React.FC = ({ title, children }) => { - const fontFaceCss = useFontFaceCss(); - + const fontLinks = useFontLinks(); + return ( {title} - + {fontLinks.map((link, index) => ())} + {fontLinks.map((link, index) => ())}
From f4e3d75c23d9d432d90b4daed46024c9fed12345 Mon Sep 17 00:00:00 2001 From: Claude Date: Sun, 19 Jul 2026 20:05:30 +0000 Subject: [PATCH 4/4] Bump server/shared to merged nra-server main (PR #27) Points at buzz-code/nra-server@8eb4b42, the merge of the timeout+fallback fix for PDF report generation (page.setContent now times out at 10s instead of 30s, falls back to a network-free render). --- server/shared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/shared b/server/shared index 0f837a20..8eb4b429 160000 --- a/server/shared +++ b/server/shared @@ -1 +1 @@ -Subproject commit 0f837a20a05596532be22f8473447198257a93f2 +Subproject commit 8eb4b429a60efdf0abcb2079902a961a251f5d6d