-
Notifications
You must be signed in to change notification settings - Fork 0
feat(workspace): guide tonight's first pre-chorus on map and player #955
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
seonghobae
wants to merge
10
commits into
develop
Choose a base branch
from
feat/workspace-first-prechorus-lift
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,208
−18
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
95e74ee
feat(workspace): guide tonight's first pre-chorus on map and player
seonghobae 711bfd4
test(workspace): reject unbounded pre-chorus display times
seonghobae 7159431
fix(workspace): bound pre-chorus display times
seonghobae 5609a7a
docs(i18n): describe translator contract
seonghobae 78d916f
test(player): require locale-consistent Korean summary
seonghobae 40130a1
feat(i18n): add localized player summary copy
seonghobae cb7ce76
feat(i18n): add Korean player summary copy
seonghobae d1975e1
fix(player): localize pre-chorus summary surface
seonghobae 4c0cf96
Merge remote-tracking branch 'origin/develop' into HEAD
seonghobae 1e9fcc8
Merge remote-tracking branch 'origin/develop' into HEAD
seonghobae File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
38 changes: 38 additions & 0 deletions
38
apps/desktop/src/features/player/index.localization.test.tsx
This file contains hidden or 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,38 @@ | ||
| import { render, screen } from "@testing-library/react"; | ||
| import { createDemoRehearsalSong } from "@bandscope/shared-types"; | ||
| import { afterEach, describe, expect, it, vi } from "vitest"; | ||
| import { PlayerFeature } from "./index"; | ||
|
|
||
| afterEach(() => { | ||
| vi.unstubAllGlobals(); | ||
| }); | ||
|
|
||
| function songWithPreChorus() { | ||
| const song = createDemoRehearsalSong(); | ||
| const seed = song.sections[0]!; | ||
| const preChorus = structuredClone(seed); | ||
| preChorus.id = "pre-chorus-localization"; | ||
| preChorus.label = "pre-chorus"; | ||
| preChorus.timeRange = { start: 20, end: 28 }; | ||
| song.sections = [preChorus]; | ||
| return song; | ||
| } | ||
|
|
||
| describe("PlayerFeature localization", () => { | ||
| it("keeps the Korean player summary and playback notice locale-consistent", () => { | ||
| vi.stubGlobal("navigator", { language: "ko-KR" }); | ||
|
|
||
| render(<PlayerFeature title="Player" song={songWithPreChorus()} />); | ||
|
|
||
| expect(screen.getByText("1개 섹션")).toBeTruthy(); | ||
| expect(screen.queryByText("1 section")).toBeNull(); | ||
| expect(screen.getByText("프리코러스")).toBeTruthy(); | ||
| expect(screen.queryByText("pre-chorus")).toBeNull(); | ||
| expect( | ||
| screen.getByText("오디오 재생은 로컬 오디오 소스가 있는 데스크톱 앱에서 사용할 수 있습니다.") | ||
| ).toBeTruthy(); | ||
| expect( | ||
| screen.queryByText("Audio playback requires the desktop app with a local audio source.") | ||
| ).toBeNull(); | ||
| }); | ||
| }); |
This file contains hidden or 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,103 @@ | ||
| import { fireEvent, render, screen } from "@testing-library/react"; | ||
| import { createDemoRehearsalSong } from "@bandscope/shared-types"; | ||
| import { describe, expect, it, vi } from "vitest"; | ||
| import { PlayerFeature } from "./index"; | ||
|
|
||
| function songWithPreChorus() { | ||
| const song = createDemoRehearsalSong(); | ||
| const seed = song.sections[0]!; | ||
| const preChorus = structuredClone(seed); | ||
| preChorus.id = "pre-chorus-1"; | ||
| preChorus.label = "pre-chorus"; | ||
| preChorus.timeRange = { start: 20, end: 28 }; | ||
| preChorus.roles = [ | ||
| { | ||
| ...seed.roles[2]!, | ||
| id: "lead-vocal", | ||
| name: "Lead Vocal", | ||
| rehearsalPriority: "high" | ||
| } | ||
| ]; | ||
| preChorus.partGraph = [ | ||
| { | ||
| role_id: "lead-vocal", | ||
| is_active: true, | ||
| handoff_to: [], | ||
| handoff_from: [] | ||
| } | ||
| ]; | ||
| song.sections = [preChorus]; | ||
| return song; | ||
| } | ||
|
|
||
| describe("PlayerFeature", () => { | ||
| it("asks the room to analyze first when no song is loaded", () => { | ||
| render(<PlayerFeature title="Player" />); | ||
| expect( | ||
| screen.getByText("Analyze tonight's song first, then hear the first pre-chorus from this player.") | ||
| ).toBeTruthy(); | ||
| }); | ||
|
|
||
| it("keeps the pre-chorus hear action unavailable without a player playback callback", () => { | ||
| render(<PlayerFeature title="Player" song={songWithPreChorus()} />); | ||
|
|
||
| expect(screen.queryByRole("button", { name: "Hear Lead Vocal pre-chorus at 0:20" })).toBeNull(); | ||
| expect(screen.getByText("Lead Vocal carries the pre-chorus at 0:20.")).toBeTruthy(); | ||
| }); | ||
|
|
||
| it("delegates the pre-chorus hear action to the owning player callback", () => { | ||
| const onPlayFromSeconds = vi.fn(); | ||
| render( | ||
| <PlayerFeature title="Player" song={songWithPreChorus()} onPlayFromSeconds={onPlayFromSeconds} /> | ||
| ); | ||
|
|
||
| fireEvent.click(screen.getByRole("button", { name: "Hear Lead Vocal pre-chorus at 0:20" })); | ||
|
|
||
| expect(onPlayFromSeconds).toHaveBeenCalledTimes(1); | ||
| expect(onPlayFromSeconds).toHaveBeenCalledWith(20); | ||
| }); | ||
|
|
||
| it("renders a safe empty summary when the runtime section collection is not an array", () => { | ||
| const song = songWithPreChorus(); | ||
| (song as unknown as { sections: unknown }).sections = null; | ||
|
|
||
| render(<PlayerFeature title="Player" song={song} />); | ||
|
|
||
| expect( | ||
| screen.getByText("No pre-chorus yet. Stay on tonight's map until the first lift is labeled.") | ||
| ).toBeTruthy(); | ||
| expect(screen.getByText("0 sections")).toBeTruthy(); | ||
| }); | ||
|
|
||
| it("renders a safe empty summary when the runtime section collection is sparse", () => { | ||
| const song = songWithPreChorus(); | ||
| const sparseSections: typeof song.sections = new Array(2); | ||
| sparseSections[1] = song.sections[0]!; | ||
| song.sections = sparseSections; | ||
|
|
||
| render(<PlayerFeature title="Player" song={song} />); | ||
|
|
||
| expect( | ||
| screen.getByText("No pre-chorus yet. Stay on tonight's map until the first lift is labeled.") | ||
| ).toBeTruthy(); | ||
| expect(screen.getByText("0 sections")).toBeTruthy(); | ||
| }); | ||
|
|
||
| it("omits malformed runtime section elements without crashing the player summary", () => { | ||
| const song = songWithPreChorus(); | ||
| song.sections = [null, song.sections[0]!] as unknown as typeof song.sections; | ||
|
|
||
| render(<PlayerFeature title="Player" song={song} />); | ||
|
|
||
| expect(screen.getByText("1 section")).toBeTruthy(); | ||
| expect(screen.getByText("pre-chorus")).toBeTruthy(); | ||
| }); | ||
|
|
||
| it("does not pass an object-valued runtime song title into React copy", () => { | ||
| const song = songWithPreChorus(); | ||
| (song as unknown as { title: unknown }).title = { unsafe: "not-copy" }; | ||
|
|
||
| expect(() => render(<PlayerFeature title="Player" song={song} />)).not.toThrow(); | ||
| expect(screen.queryByText("not-copy")).toBeNull(); | ||
| }); | ||
| }); |
This file contains hidden or 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
67 changes: 67 additions & 0 deletions
67
apps/desktop/src/features/workspace/FirstPreChorusCallout.reduced-motion.test.tsx
This file contains hidden or 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,67 @@ | ||
| import { fireEvent, render, screen } from "@testing-library/react"; | ||
| import { createDemoRehearsalSong } from "@bandscope/shared-types"; | ||
| import { afterEach, describe, expect, it, vi } from "vitest"; | ||
| import { FirstPreChorusCallout } from "./FirstPreChorusCallout"; | ||
|
|
||
| function songWithPreChorus() { | ||
| const song = createDemoRehearsalSong(); | ||
| const seed = song.sections[0]!; | ||
| const preChorus = structuredClone(seed); | ||
| preChorus.id = "pre-chorus-1"; | ||
| preChorus.label = "pre-chorus"; | ||
| preChorus.timeRange = { start: 20, end: 28 }; | ||
| preChorus.roles = [ | ||
| { | ||
| ...seed.roles[2]!, | ||
| id: "lead-vocal", | ||
| name: "Lead Vocal", | ||
| rehearsalPriority: "high" | ||
| } | ||
| ]; | ||
| preChorus.partGraph = [ | ||
| { | ||
| role_id: "lead-vocal", | ||
| is_active: true, | ||
| handoff_to: [], | ||
| handoff_from: [] | ||
| } | ||
| ]; | ||
| song.sections = [preChorus]; | ||
| return song; | ||
| } | ||
|
|
||
| describe("FirstPreChorusCallout reduced motion", () => { | ||
| afterEach(() => { | ||
| vi.unstubAllGlobals(); | ||
| }); | ||
|
|
||
| it("scrolls immediately when the operating system requests reduced motion", () => { | ||
| vi.stubGlobal("matchMedia", (query: string) => ({ | ||
| matches: query === "(prefers-reduced-motion: reduce)", | ||
| media: query, | ||
| onchange: null, | ||
| addListener: vi.fn(), | ||
| removeListener: vi.fn(), | ||
| addEventListener: vi.fn(), | ||
| removeEventListener: vi.fn(), | ||
| dispatchEvent: vi.fn() | ||
| })); | ||
|
|
||
| const grid = document.createElement("div"); | ||
| grid.dataset.testid = "song-structure-grid"; | ||
| const target = document.createElement("div"); | ||
| const scrollIntoView = vi.fn(); | ||
| Object.defineProperty(target, "scrollIntoView", { | ||
| configurable: true, | ||
| value: scrollIntoView | ||
| }); | ||
| grid.appendChild(target); | ||
| document.body.appendChild(grid); | ||
|
|
||
| render(<FirstPreChorusCallout song={songWithPreChorus()} />); | ||
| fireEvent.click(screen.getByRole("button", { name: "Open Lead Vocal pre-chorus at 0:20" })); | ||
| expect(scrollIntoView).toHaveBeenCalledWith({ block: "nearest", behavior: "auto" }); | ||
|
|
||
| grid.remove(); | ||
| }); | ||
| }); |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.