-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix/no_live_openai
- Loading branch information
Showing
9 changed files
with
952 additions
and
344 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| import { useEffect } from "react"; | ||
| import { getReport, scan } from "react-scan"; | ||
|
|
||
| import { aiLogger } from "@oakai/logger"; | ||
|
|
||
| const log = aiLogger("ui:performance"); | ||
|
|
||
| declare global { | ||
| interface Window { | ||
| NEXT_PUBLIC_ENABLE_RENDER_SCAN?: string; | ||
| } | ||
| } | ||
|
|
||
| const isRenderScanEnabled = | ||
| (typeof process !== "undefined" && | ||
| process.env.NEXT_PUBLIC_ENABLE_RENDER_SCAN === "true") || | ||
| (typeof window !== "undefined" && | ||
| window.NEXT_PUBLIC_ENABLE_RENDER_SCAN === "true"); | ||
|
|
||
| const getSingleReport = <T>( | ||
| report: RenderData, | ||
| component: React.ComponentType<T>, | ||
| ) => { | ||
| return transformReport([component?.name, report]); | ||
| }; | ||
|
|
||
| const getSortedAndFilteredReports = (reports: Map<string, RenderData>) => { | ||
| const reportsArray = Array.from(reports.entries()) | ||
| .filter(([componentName]) => { | ||
| // Exclude styled components and other library-generated components | ||
| const isCustomComponent = | ||
| // Check if name exists and doesn't start with known library prefixes | ||
| componentName && | ||
| !componentName.startsWith("Styled") && | ||
| !componentName.includes("styled") && | ||
| !componentName.startsWith("_") && | ||
| !componentName.includes("$") && | ||
| componentName !== "div" && | ||
| componentName !== "span"; | ||
|
|
||
| return isCustomComponent; | ||
| }) | ||
| .map(transformReport); | ||
|
|
||
| const sortedReports = reportsArray.toSorted( | ||
| (a, b) => b.renderCount - a.renderCount, | ||
| ); | ||
| return sortedReports; | ||
| }; | ||
|
|
||
| function getWindowPropertyName<T>(component: React.ComponentType<T>): string { | ||
| return `reactScan${component.displayName ?? component.name ?? "UnknownComponent"}`; | ||
| } | ||
|
|
||
| function setWindowObjectForPlaywright<T>( | ||
| component: React.ComponentType<T> | undefined, | ||
| report: sortedReport, | ||
| ) { | ||
| if (component) { | ||
| const windowPropertyName = getWindowPropertyName(component); | ||
| window[windowPropertyName] = report; | ||
| } | ||
| } | ||
|
|
||
| function transformReport([componentName, report]: [ | ||
| string | undefined, | ||
| RenderData, | ||
| ]) { | ||
| return { | ||
| name: componentName, | ||
| renderCount: report.renders.length, | ||
| totalRenderTime: report.time, | ||
| }; | ||
| } | ||
|
|
||
| interface RenderData { | ||
| count: number; | ||
| time: number; | ||
| renders: Array<unknown>; | ||
| displayName: string | null; | ||
| type: React.ComponentType<unknown> | null; | ||
| } | ||
|
|
||
| type sortedReport = { | ||
| name: string | undefined; | ||
| renderCount: number; | ||
| totalRenderTime: number; | ||
| }; | ||
|
|
||
| // Enable React Scan for performance monitoring - use with dev:react-scan | ||
| // Pass in component to get report for specific component | ||
| // Pass in interval to get reports at regular intervals | ||
| // - useReactScan({ component: LessonPlanDisplay, interval: 10000 }); | ||
| // When a component is passed it will be added to window object for Playwright testing | ||
|
|
||
| export const useReactScan = <T extends object>({ | ||
| component, | ||
| interval, | ||
| }: { | ||
| component?: React.ComponentType<T>; | ||
| interval?: number; | ||
| }) => { | ||
| useEffect(() => { | ||
| if (isRenderScanEnabled) { | ||
| try { | ||
| log.info("Initializing React Scan..."); | ||
| if (typeof window !== "undefined") { | ||
| scan({ | ||
| enabled: true, | ||
| log: true, | ||
| report: true, | ||
| renderCountThreshold: 0, | ||
| showToolbar: true, | ||
| }); | ||
| } | ||
| log.info("React Scan initialized successfully"); | ||
| } catch (error) { | ||
| log.error("React Scan initialization error:", error); | ||
| } | ||
|
|
||
| const getRenderReport = () => { | ||
| try { | ||
| log.info("Attempting to get render reports..."); | ||
|
|
||
| const report = component ? getReport(component) : getReport(); | ||
|
|
||
| if (report instanceof Map) { | ||
| const allComponentReport = getSortedAndFilteredReports(report); | ||
| log.table(allComponentReport); | ||
| } else if (report !== null && component) { | ||
| const singleComponentReport = getSingleReport(report, component); | ||
| setWindowObjectForPlaywright(component, singleComponentReport); | ||
| log.info("Single Report:,", singleComponentReport); | ||
| } | ||
| } catch (error) { | ||
| log.error("Performance Monitoring Error:", error); | ||
| } | ||
| }; | ||
| // If interval is provided, get reports at regular intervals | ||
| if (interval) { | ||
| const performanceInterval = setInterval(getRenderReport, interval); | ||
|
|
||
| return () => clearInterval(performanceInterval); | ||
| } else { | ||
| getRenderReport(); | ||
| } | ||
| } | ||
| }, [component, interval]); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import { expect, test, type Page } from "@playwright/test"; | ||
|
|
||
| import { TEST_BASE_URL } from "../config/config"; | ||
| import { prepareUser } from "../helpers/auth"; | ||
| import { cspSafeWaitForFunction } from "../helpers/auth/clerkHelpers"; | ||
| import { bypassVercelProtection } from "../helpers/vercel"; | ||
| import { isFinished } from "./aila-chat/helpers"; | ||
|
|
||
| declare global { | ||
| interface Window { | ||
| reactScanLessonPlanDisplay: { renderCount: number }; | ||
| NEXT_PUBLIC_ENABLE_RENDER_SCAN?: string; | ||
| } | ||
| } | ||
|
|
||
| test.describe("Component renders during lesson chat", () => { | ||
| test.beforeEach(async ({ page }) => { | ||
| await page.addInitScript(() => { | ||
| window.NEXT_PUBLIC_ENABLE_RENDER_SCAN = "true"; | ||
| }); | ||
| await test.step("Setup", async () => { | ||
| await bypassVercelProtection(page); | ||
| const login = await prepareUser(page, "typical"); | ||
|
|
||
| await page.goto(`${TEST_BASE_URL}/aila/${login.chatId}`); | ||
| await isFinished(page); | ||
| }); | ||
| }); | ||
|
|
||
| // this is disabled because react scan is not currently working in preview deplyments. | ||
| test.skip("There are no unnecessary rerenders across left and right side of chat", async ({ | ||
| page, | ||
| }) => { | ||
| await test.step("Chat box keyboard input does not create rerenders in lesson plan", async () => { | ||
| await verifyChatInputRenders(page); | ||
| }); | ||
| }); | ||
|
|
||
| async function verifyChatInputRenders(page: Page) { | ||
| await page.waitForTimeout(10000); | ||
|
|
||
| await cspSafeWaitForFunction( | ||
| page, | ||
| () => | ||
| window.reactScanLessonPlanDisplay && | ||
| typeof window.reactScanLessonPlanDisplay.renderCount === "number", | ||
| ); | ||
|
|
||
| const textbox = page.getByTestId("chat-input"); | ||
| const message = "Create a KS1 lesson on the end of Roman Britain"; | ||
| const initialRenderAmount: number = await page.evaluate( | ||
| () => window.reactScanLessonPlanDisplay.renderCount, | ||
| ); | ||
| await page.keyboard.type(message); | ||
| await expect(textbox).toContainText(message); | ||
| await page.waitForTimeout(10000); | ||
| const finalRenderAmount: number = await page.evaluate( | ||
| () => window.reactScanLessonPlanDisplay.renderCount, | ||
| ); | ||
|
|
||
| expect(initialRenderAmount).toBeLessThan(20); | ||
| // We should expect the render count to be the same because we are only | ||
| // interacting with the left side of the chat. This should be fixed and updated | ||
| expect(finalRenderAmount).toBeLessThan(400); | ||
| } | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.