diff --git a/apps/web/src/hooks/useSidebarProjectGroups.ts b/apps/web/src/hooks/useSidebarProjectGroups.ts index 88210360d2a7f..7a0036d35786d 100644 --- a/apps/web/src/hooks/useSidebarProjectGroups.ts +++ b/apps/web/src/hooks/useSidebarProjectGroups.ts @@ -1,3 +1,5 @@ +import { useMessages } from "gt-react"; + import { orderItemsByPreferredIds, sortSidebarV2ProjectGroups } from "../components/Sidebar.logic"; import { getProjectOrderKey, @@ -20,6 +22,7 @@ export function useSidebarProjectGroups() { const groupingSettings = useClientSettings(selectProjectGroupingSettings); const environments = useEnvironmentIdentities(); const primaryEnvironmentId = usePrimaryEnvironmentId(); + const resolve = useMessages(); const orderedProjects = orderItemsByPreferredIds({ items: projects, preferredIds: projectOrder, @@ -32,12 +35,15 @@ export function useSidebarProjectGroups() { const labels = new Map( environments.map((environment) => [environment.environmentId, environment.label] as const), ); - const unsortedGroups = buildSidebarProjectSnapshots({ - projects: sortOrder === "manual" ? orderedProjects : projects, - groupScratchProjects: true, - settings: groupingSettings, - primaryEnvironmentId, - resolveEnvironmentLabel: (environmentId) => labels.get(environmentId) ?? null, - }); + const unsortedGroups = buildSidebarProjectSnapshots( + { + projects: sortOrder === "manual" ? orderedProjects : projects, + groupScratchProjects: true, + settings: groupingSettings, + primaryEnvironmentId, + resolveEnvironmentLabel: (environmentId) => labels.get(environmentId) ?? null, + }, + resolve, + ); return sortSidebarV2ProjectGroups(unsortedGroups, threads, sortOrder, delegatedUnderParent); } diff --git a/apps/web/src/sidebarProjectGrouping.ts b/apps/web/src/sidebarProjectGrouping.ts index 8209922a2c60e..b8931f32051d1 100644 --- a/apps/web/src/sidebarProjectGrouping.ts +++ b/apps/web/src/sidebarProjectGrouping.ts @@ -11,6 +11,7 @@ import { } from "@t3tools/client-runtime/state/project-grouping"; import { msg } from "gt-react"; +import { m, type MessageResolver } from "./i18n/messages"; import type { Project } from "./types"; export const PROJECT_GROUPING_MODE_LABELS: Record = { @@ -139,21 +140,27 @@ export function buildPhysicalToLogicalProjectKeyMap(input: { return mapping; } -export function buildSidebarProjectSnapshots(input: { - projects: ReadonlyArray; - settings: ProjectGroupingSettings; - groupScratchProjects?: boolean; - primaryEnvironmentId: EnvironmentId | null; - resolveEnvironmentLabel: (environmentId: EnvironmentId) => string | null; - isDesktopLocalEnvironment?: (environmentId: EnvironmentId) => boolean; - isWslEnvironment?: (environmentId: EnvironmentId) => boolean; -}): SidebarProjectSnapshot[] { - return buildProjectGroups({ - projects: input.projects, - groupScratchProjects: input.groupScratchProjects ?? false, - settings: input.settings, - preferredEnvironmentId: input.primaryEnvironmentId, - }).map((group): SidebarProjectSnapshot => { +export function buildSidebarProjectSnapshots( + input: { + projects: ReadonlyArray; + settings: ProjectGroupingSettings; + groupScratchProjects?: boolean; + primaryEnvironmentId: EnvironmentId | null; + resolveEnvironmentLabel: (environmentId: EnvironmentId) => string | null; + isDesktopLocalEnvironment?: (environmentId: EnvironmentId) => boolean; + isWslEnvironment?: (environmentId: EnvironmentId) => boolean; + }, + resolve: MessageResolver = m, +): SidebarProjectSnapshot[] { + return buildProjectGroups( + { + projects: input.projects, + groupScratchProjects: input.groupScratchProjects ?? false, + settings: input.settings, + preferredEnvironmentId: input.primaryEnvironmentId, + }, + resolve, + ).map((group): SidebarProjectSnapshot => { const members = group.members.map( ({ physicalProjectKey, project }): SidebarProjectGroupMember => ({ ...project, diff --git a/scripts/scenarios/scratch-folder-follows-language.e2e.ts b/scripts/scenarios/scratch-folder-follows-language.e2e.ts new file mode 100644 index 0000000000000..986aa1ddb7454 --- /dev/null +++ b/scripts/scenarios/scratch-folder-follows-language.e2e.ts @@ -0,0 +1,90 @@ +/// +import { expect } from "e2e"; + +import { test, WEB } from "./t3.ts"; + +test( + "The project folder for threads without a project follows the app language", + WEB, + async ({ t3, app, browser, screen }) => { + const project = await t3.project("scenario-scratch"); + const thread = await t3.thread({ project, title: "Scratch work", messages: ["Start"] }); + + // The scenario home is inside a Git checkout, where the server disables native scratch. + // Advertise the seeded workspace as scratch while leaving the real project and thread in place. + await browser.addInitScript((scratchWorkspaceRoot) => { + const configRequests = new WeakMap(); + const send = WebSocket.prototype.send; + WebSocket.prototype.send = function (data) { + if (typeof data === "string") { + for (const request of [JSON.parse(data)].flat()) { + if (request?._tag === "Request" && request.tag === "subscribeServerConfig") { + configRequests.set(this, String(request.id)); + } + } + } + return send.call(this, data); + }; + const addEventListener = WebSocket.prototype.addEventListener; + WebSocket.prototype.addEventListener = function ( + this: WebSocket, + type: string, + listener: EventListenerOrEventListenerObject, + options?: boolean | AddEventListenerOptions, + ) { + if (type !== "message" || typeof listener !== "function") { + return addEventListener.call(this, type, listener, options); + } + return addEventListener.call( + this, + type, + (event: Event) => { + const data = (event as MessageEvent).data; + if (typeof data !== "string") return listener.call(this, event); + const parsed = JSON.parse(data); + let changed = false; + for (const message of [parsed].flat()) { + if ( + message?._tag !== "Chunk" || + String(message.requestId) !== configRequests.get(this) + ) + continue; + for (const value of message.values) { + if (value.type === "snapshot") { + value.config.scratchWorkspaceRoot = scratchWorkspaceRoot; + changed = true; + } + } + } + return listener.call( + this, + changed ? new MessageEvent("message", { data: JSON.stringify(parsed) }) : event, + ); + }, + options, + ); + } as typeof WebSocket.prototype.addEventListener; + }, project); + + await t3.open("/settings/labs"); + await screen.getByLabel("Boring sidebar (group by project)", { exact: true }).tap(); + await screen.getByLabel("Two-line folder rows", { exact: true }).waitFor(); + + await t3.open("/settings/general"); + const openFolder = screen.getByTestId("sidebar-project-folder"); + await expect(openFolder).toContainText("No project", { timeout: 60_000 }); + await screen.getByLabel("Language", { exact: true }).tap(); + await screen.getByText("日本語", { exact: true }).tap(); + await screen.getByLabel("言語", { exact: true }).waitFor(); + // Settings leaves the sidebar mounted. Keep this failure through the capture after reopening. + await expect.soft(openFolder).toContainText("プロジェクトなし"); + + await t3.open(thread); + const folder = screen.getByTestId("sidebar-project-folder"); + await folder.getByText(/^(?:No project|プロジェクトなし)$/, { exact: true }).waitFor({ + timeout: 60_000, + }); + await app.screenshot("scratch-folder-in-japanese"); + await expect(folder).toContainText("プロジェクトなし"); + }, +);