-
Notifications
You must be signed in to change notification settings - Fork 4.5k
fix(mobile): display proposed plans in thread feed #7264
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
tomhhealy
wants to merge
2
commits into
pingdotgg:main
Choose a base branch
from
tomhhealy:fix/mobile-plan-display
base: main
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.
+314
−1
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| import { describe, expect, it } from "vite-plus/test"; | ||
|
|
||
| import { | ||
| buildCollapsedProposedPlanPreviewMarkdown, | ||
| proposedPlanTitle, | ||
| stripDisplayedPlanMarkdown, | ||
| } from "./proposedPlan"; | ||
|
|
||
| describe("mobile proposed-plan presentation", () => { | ||
| it("separates the title from the displayed plan body", () => { | ||
| const markdown = "# Update Index Greeting\n\n## Summary\n\nReplace the old content."; | ||
|
|
||
| expect(proposedPlanTitle(markdown)).toBe("Update Index Greeting"); | ||
| expect(stripDisplayedPlanMarkdown(markdown)).toBe("Replace the old content."); | ||
| }); | ||
|
|
||
| it("ignores leading blank lines before removing the title and summary headings", () => { | ||
| expect(stripDisplayedPlanMarkdown("\n# Update Index\n\n## Summary\nBody")).toBe("Body"); | ||
| }); | ||
|
|
||
| it("falls back when the plan has no heading", () => { | ||
| expect(proposedPlanTitle("- inspect\n- update")).toBeNull(); | ||
| }); | ||
|
|
||
| it("preserves a non-summary heading in the displayed body", () => { | ||
| expect( | ||
| stripDisplayedPlanMarkdown("# Update Index Greeting\n\n## Scope\n\n- Update the page."), | ||
| ).toBe("## Scope\n\n- Update the page."); | ||
| }); | ||
|
|
||
| it("builds a bounded preview for long plans", () => { | ||
| expect( | ||
| buildCollapsedProposedPlanPreviewMarkdown( | ||
| "# Update Index Greeting\n\n- inspect\n- update\n- verify", | ||
| { maxLines: 2 }, | ||
| ), | ||
| ).toBe("- inspect\n- update\n\n..."); | ||
| }); | ||
| }); |
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,68 @@ | ||
| // Keep these presentation rules aligned with apps/web/src/proposedPlan.ts; | ||
| // rendering and plan actions remain platform-specific. | ||
| export function proposedPlanTitle(planMarkdown: string): string | null { | ||
| const heading = planMarkdown.match(/^\s{0,3}#{1,6}\s+(.+)$/m)?.[1]?.trim(); | ||
| return heading && heading.length > 0 ? heading : null; | ||
| } | ||
|
|
||
| export function stripDisplayedPlanMarkdown(planMarkdown: string): string { | ||
| const lines = planMarkdown.trimEnd().split(/\r?\n/); | ||
| const sourceLines = [...lines]; | ||
| while (sourceLines[0]?.trim().length === 0) { | ||
| sourceLines.shift(); | ||
| } | ||
| if (sourceLines[0] && /^\s{0,3}#{1,6}\s+/.test(sourceLines[0])) { | ||
| sourceLines.shift(); | ||
| } | ||
| while (sourceLines[0]?.trim().length === 0) { | ||
| sourceLines.shift(); | ||
| } | ||
| const firstHeadingMatch = sourceLines[0]?.match(/^\s{0,3}#{1,6}\s+(.+)$/); | ||
| if (firstHeadingMatch?.[1]?.trim().toLowerCase() === "summary") { | ||
| sourceLines.shift(); | ||
| while (sourceLines[0]?.trim().length === 0) { | ||
| sourceLines.shift(); | ||
| } | ||
| } | ||
| return sourceLines.join("\n"); | ||
| } | ||
|
|
||
| export function buildCollapsedProposedPlanPreviewMarkdown( | ||
| planMarkdown: string, | ||
| options?: { readonly maxLines?: number }, | ||
| ): string { | ||
| const maxLines = options?.maxLines ?? 8; | ||
| const lines = stripDisplayedPlanMarkdown(planMarkdown) | ||
| .trimEnd() | ||
| .split(/\r?\n/) | ||
| .map((line) => line.trimEnd()); | ||
| const previewLines: string[] = []; | ||
| let visibleLineCount = 0; | ||
| let hasMoreContent = false; | ||
|
|
||
| for (const line of lines) { | ||
| const isVisibleLine = line.trim().length > 0; | ||
| if (isVisibleLine && visibleLineCount >= maxLines) { | ||
| hasMoreContent = true; | ||
| break; | ||
| } | ||
| previewLines.push(line); | ||
| if (isVisibleLine) { | ||
| visibleLineCount += 1; | ||
| } | ||
| } | ||
|
|
||
| while (previewLines.length > 0 && previewLines.at(-1)?.trim().length === 0) { | ||
| previewLines.pop(); | ||
| } | ||
|
|
||
| if (previewLines.length === 0) { | ||
| return proposedPlanTitle(planMarkdown) ?? "Plan preview unavailable."; | ||
| } | ||
|
|
||
| if (hasMoreContent) { | ||
| previewLines.push("", "..."); | ||
| } | ||
|
|
||
| return previewLines.join("\n"); | ||
| } | ||
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
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
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.