mirror of
https://github.com/penpot/penpot.git
synced 2026-11-19 00:20:35 +00:00
* ✨ Add review mode, review comments and tasks to design reviews A design review now opens a read-only review mode. The left panel shows the pages and layers with the View only badge, the toolbar offers the review tools (move, comment, comment an area, create a task, show the changes) and the right panel holds the inspect of the selection, the comments of the review and its tasks. A bar at the bottom names the review, shows the progress of its tasks and opens its details. Comments can point at a spot, a layer or an area, and a comment written in a review says so with its own mark, wherever the file is open. The layers panel counts the open comments of each layer. Tasks are new: work on a file, assigned to someone and tied to a layer or to a spot of the canvas. A comment can become a task and stays attached to it. A task moves through open, done, verified, reopened and won't do; anybody may move it, and each move is an event that records who made it. Deleting a layer with open tasks moves them to its board and offers to undo the deletion or to mark them done; a task can then be linked to another layer or get its layer back. Assignees are told by email. Merging a branch moves its tasks and their threads into main: the open ones keep going, the closed ones stay as its history, and the merge dialog lists them and can tell their assignees. The details of a review show its overview, its tasks and its activity: what the saves of the branch did to each layer since the review opened, by person and day, with the values before and after. The changes can be shown on the canvas one after another. The backend adds the review fields of a comment thread, the task and task event tables, the activity of a review (recorded by each save of a branch under review) and the commands of the tasks. * ♻️ Bring the design review styles and components up to the DS Move what the review UI repeated into the design system: layer-chip*, progress-bar*, comment-card*, link-button* and textarea*, each with its story and docs. The screens keep the look they had: the same review states compare equal, pixel by pixel, before and after. The stylesheets follow the rules of the UI guide: local variables for the colors that change by state, the right tokens, no unused imports and fewer element and nested selectors. What has no DS token or typography says so in a TODO. The aliases left in comments.scss resolve to their tokens. The components get complete schemas and a single owner for the copyright. Translations take literal keys and templates instead of dynamic keys and glued strings, and comments.cljs no longer depends on the review tasks: the workspace passes it what a thread shows about its task. Fix three bugs of the review: - The inspect took the width of a narrower panel and its height from the window, so it looked squeezed and cut its last rows. It now fills the panel that holds it. - Enter on the menu of a task opened the task. The row now reacts only to keys on itself, and the menu keeps Enter from the workspace shortcuts. - The resolved and lost marks ignored the pointer: hover now wins over the state of a mark. * ✨ Turn each review message into a task and restore the filter dropdown Each message of a thread can now become a task, so one thread can hold several. The new file_task.comment_id column records the message, the migration fills it with the first message of the thread for existing tasks, and the backend rejects a message from another thread or one that already has a task. Comments and tasks of a review behave like normal ones. The canvas marks show a short preview on hover and there is one mark per task. A blue label marks what belongs to a review, in the thread and in the sidebar, and a selected card takes a blue border there and the primary color elsewhere. The new review-label* component holds the label. The sidebar and the review panel go back to a filter dropdown in place of the chips. Comments offer the views all, yours and mentions, with an option to hide the resolved ones. Tasks offer all, yours, open and to verify, with an option to hide the closed ones. Resolved comments now show by default. "New task" outside a review now arms the task tool: it shows the task cursor and the next click opens the task form, not a comment. Then the comment tool returns, and Esc leaves the tool. The details modal shows changed properties in the format of the compare dialogs, and showing a task on the canvas syncs the WASM viewport. The sidebar cards put the layer chip on the line of the replies, and task states lose the dot and take a color each. Fix these bugs: - The hover card of the activity tab crashed on a change with no token. - The assignee and reviewer dropdowns came out cut. The select now portals into the closest dialog, because the modal makes the rest of the page inert. - The review label cut the header of the thread. It now sits below it. * ✨ Group overlapping review marks and let tasks change assignee Comments and tasks of a review that fall on the same spot now show as one mark with a counter in a white bubble. A click fans them out, as the comment bubbles do, and the user picks one. They group on the same layer and, by proximity, at a low zoom. The card of the mark lists up to five items. Hovering a mark outlines its layer, or its board when the layer is gone. The WASM viewport draws no outlines under the comments tool, so it now draws the highlighted ones there. Opening a comment from a mark closes the open task. A task can change assignee from the selector in its state and from "Assign to" in its menu, which holds the team in the same popover. The change shows right away and goes to the history of the task. A closed task keeps its assignee. Deleting a task or a comment now asks first, with the usual confirmation. A task deleted from the details of a review brings the dialog back on its tab. The state of a task takes two rows, in its panel and in a thread: state and layer, then assignee and the review it comes from, which a review omits. The text of tasks and comments sits in a box. The history no longer says that the task was created. * ✨ Keep the branch bar and the palettes at one level on a branch The open branch bar covered the horizontal scroll of the canvas. It now sits as far from the bottom as the review bar. Folded, it stays flush. On a branch the palettes no longer lift over the branch bar: both sit at the same level and work as a toggle. Opening one folds the other, also through the palette shortcuts, and both can stay folded. The new `:bottom-bar` state says which one is open. It exists only while the branch bar does, so a file that is not a branch keeps the palettes on their layout flags and at their usual place, and what happens on a branch does not reach them. The branch bar comes open on a branch and centers on the canvas, not on the window, so that it clears the folded palettes at usual widths. The room it published for the palettes goes away with the lifting. * ✨ Give every task a thread and tidy the design review screens Every task now lives in a message of a comment thread, so anyone can go on commenting on it. A task made from scratch gets a thread whose first message is its title, on its layer and in its review, created in the same transaction. A comment turned into a task keeps its thread, as before. The panel of a task with no thread is gone: a task always opens as its thread. Migration 0814 gives a thread to the tasks that had none. Deleting a thread deletes its tasks, after a confirmation that says so. The anchor of a task was a plain map, not a point, so a thread on a layer refused replies. It is now a point. The details of a review filter the tasks by state with the chips of the activity, in the colour of each state, and show how many are closed on the right. The "New task" button leaves the dialog. Descriptions look the same everywhere: the box of the branch info dialog, an "Edit" button and a dashed box when empty. Read, they grow up to 400px and scroll inside; edited, the textarea starts at 400px. The text of a review in the sidebar does the same once unfolded. In the review bar, the author gets a "Publish latest changes" button when the branch moved past the review, with a hint that approvals must be renewed. The others keep a badge, now "Unpublished changes", with a hint. The bar refreshes once the publish lands. Smaller changes: the resolve checkbox lines up with the task button and has a tooltip, messages sit in a filled box, task events take an outline, and the change navigator sits right above the review bar. * 💄 Sort the test runner requires that cljfmt rejects The Frontend Tests lint step fails on runner.cljs: the requires for workspace-tasks-test, review-details-test and review-markers-test sat out of alphabetical order. This is the output of cljfmt fix. AI-assisted-by: claude-opus-5-5 Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro> * 🐛 Test the design review mode in the pull request spec The review bar replaced the branch banner, so four tests still drove the branch bar: a visible Compare button, the rectangle tool and the Review button. They now drive the design review instead. * Opening a file with a pr-id enters the review: the bar names the review, the header trades the file name for the review title, and comparing, merging and cancelling sit in the bar's options menu. * The compare dialog opens from that menu. * The review is read-only rather than an editable file: the review toolbar offers its five tools, the drawing tools are gone, the sidebar says View only, and the right panel is the review's own Inspect, Comments and Tasks tabs. * The verdict comes from the bar's Submit review button and the dialog it opens, scoped by role so the bar action and the dialog action do not collide. The tests also reach the review bar by its region label instead of walking up three parents from the Reviewing the design review text, which broke as soon as the bar's markup changed. AI-assisted-by: claude-opus-5-5 Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro> * 🐛 Count only the test thread's acquisitions in the climit test acquires-the-command-own-limits-before-the-root-limits failed on CI with an extra "root/global" ahead of the expected order. The test records metrics through with-redefs, which is global, so a call of another thread of the test JVM, such as an RPC an earlier test left running, can take a root limiter inside the window and land in the same atom. Record the thread with each metrics call and keep, in acquired-in-order, only the acquisitions of the calling thread. Both tests that read it acquire their limiters on the test thread. The same class of flake was fixed on develop for the waiting-count test (12d73d0f63); this one is still open there. AI-assisted-by: claude-opus-5-5 Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro> * 📚 Describe the task moves the server allows in the table comment The comment on file_task said a task is reopened only from done and that editors move tasks. files_task.clj::transitions also reopens a verified or won't-do task, and set-task-status lets anybody who can read the file move one. Say the same in the schema. AI-assisted-by: claude-opus-5-5 Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro> --------- Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro> Co-authored-by: Álvaro Tejero Cantero <alvorithm@teje.ro>
266 lines
10 KiB
JavaScript
266 lines
10 KiB
JavaScript
import { test, expect } from "@playwright/test";
|
|
import { WorkspacePage } from "../pages/WorkspacePage";
|
|
|
|
const PR_ID = "c7ce0794-0992-8105-8004-38f280443999";
|
|
|
|
// The review bar at the bottom of the canvas: the review's own chrome,
|
|
// which replaces the branch bar while a design review is open.
|
|
const reviewBar = (page) => page.getByRole("region", { name: "Design review" });
|
|
|
|
test.beforeEach(async ({ page }) => {
|
|
await WorkspacePage.init(page);
|
|
await WorkspacePage.mockConfigFlags(page, ["enable-branching"]);
|
|
});
|
|
|
|
const setupPullRequestSandbox = async (workspacePage) => {
|
|
await workspacePage.setupEmptyFile();
|
|
await workspacePage.mockRPCs({
|
|
"get-file-branch-info?file-id=*":
|
|
"pull-requests/get-file-branch-info-none.json",
|
|
"get-file-branches?file-id=*": "pull-requests/get-file-branches-empty.json",
|
|
"get-file-pull-requests?file-id=*":
|
|
"pull-requests/get-file-pull-requests.json",
|
|
"get-pull-request?id=*": "pull-requests/get-pull-request.json",
|
|
"get-branch-diff?branch-id=*": "pull-requests/get-branch-diff-empty.json",
|
|
"submit-pull-request-review":
|
|
"pull-requests/submit-pull-request-review.json",
|
|
});
|
|
};
|
|
|
|
test("opening a file with pr-id enters the design review", async ({ page }) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
await workspacePage.goToWorkspace({ extraParams: `&pr-id=${PR_ID}` });
|
|
|
|
// the review bar names the review being read, and the header trades the
|
|
// file name for the title of the review
|
|
const bar = reviewBar(page);
|
|
await expect(bar).toBeVisible();
|
|
await expect(
|
|
bar.getByText("Reviewing the design review", { exact: true }),
|
|
).toBeVisible();
|
|
await expect(
|
|
bar.getByText("Checkout redesign", { exact: true }),
|
|
).toBeVisible();
|
|
await expect(page.getByTitle("Review: Checkout redesign")).toBeVisible();
|
|
|
|
// the essentials are visible buttons: the details, the verdict of an
|
|
// assigned reviewer, and the way out
|
|
await expect(bar.getByRole("button", { name: "Details" })).toBeVisible();
|
|
await expect(
|
|
bar.getByRole("button", { name: "Submit review" }),
|
|
).toBeVisible();
|
|
await expect(bar.getByRole("button", { name: "Exit review" })).toBeVisible();
|
|
|
|
// comparing, merging and cancelling live behind the kebab menu
|
|
await expect(bar.getByRole("button", { name: "Compare" })).toBeHidden();
|
|
await bar.getByRole("button", { name: "Options" }).click();
|
|
await expect(page.getByText("Compare", { exact: true })).toBeVisible();
|
|
await expect(page.getByText("Merge to main")).toBeVisible();
|
|
await expect(page.getByText("Cancel review")).toBeVisible();
|
|
});
|
|
|
|
test("the compare dialog shows the proposed changes", async ({ page }) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
await workspacePage.goToWorkspace({ extraParams: `&pr-id=${PR_ID}` });
|
|
|
|
// comparing is one of the review bar's options
|
|
await reviewBar(page).getByRole("button", { name: "Options" }).click();
|
|
await page.getByText("Compare", { exact: true }).click();
|
|
|
|
// the branching compare dialog is reused to inspect the changes
|
|
await expect(page.getByText("Review changes")).toBeVisible();
|
|
});
|
|
|
|
test("accepting the pull request opens the merge dialog", async ({ page }) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
await workspacePage.goToWorkspace({ extraParams: `&pr-id=${PR_ID}` });
|
|
|
|
const banner = reviewBar(page);
|
|
await banner.getByRole("button", { name: "Options" }).click();
|
|
await page.getByText("Merge to main").click();
|
|
|
|
// the branching merge dialog handles the actual integration
|
|
await expect(page.getByText("Merge into main")).toBeVisible();
|
|
await expect(page.getByText("checkout").first()).toBeVisible();
|
|
});
|
|
|
|
test("the review is read-only", async ({ page }) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
await workspacePage.goToWorkspace({ extraParams: `&pr-id=${PR_ID}` });
|
|
|
|
await expect(reviewBar(page)).toBeVisible();
|
|
|
|
// the review toolbar replaces the design tools: moving around,
|
|
// commenting and tasks only, so the canvas offers no way to draw
|
|
const toolbar = page.getByRole("toolbar", { name: "Review tools" });
|
|
await expect(toolbar).toBeVisible();
|
|
for (const tool of [
|
|
"Move",
|
|
"Comment",
|
|
"Comment an area",
|
|
"Create a task",
|
|
"Show changes",
|
|
]) {
|
|
await expect(
|
|
toolbar.getByRole("button", { name: tool, exact: true }),
|
|
).toBeVisible();
|
|
}
|
|
await expect(workspacePage.rectShapeButton).toBeHidden();
|
|
|
|
// and the sidebar flags the file as view only
|
|
await expect(page.getByText("View only")).toBeVisible();
|
|
|
|
// the right panel is the review's: the inspect of the selection, the
|
|
// comments and the tasks of the review
|
|
await expect(page.getByRole("tab", { name: "Inspect" })).toBeVisible();
|
|
await expect(page.getByRole("tab", { name: "Comments (0)" })).toBeVisible();
|
|
await expect(page.getByRole("tab", { name: "Tasks (0)" })).toBeVisible();
|
|
});
|
|
|
|
test("an assigned reviewer can submit a verdict from the review bar", async ({
|
|
page,
|
|
}) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
await workspacePage.goToWorkspace({ extraParams: `&pr-id=${PR_ID}` });
|
|
|
|
// the logged-in profile is an assigned reviewer in the fixture, so the
|
|
// bar offers the verdict
|
|
const bar = reviewBar(page);
|
|
await bar.getByRole("button", { name: "Submit review" }).click();
|
|
|
|
const dialog = page.getByRole("dialog");
|
|
await expect(dialog).toBeVisible();
|
|
await expect(
|
|
dialog.getByRole("heading", { name: "Submit review" }),
|
|
).toBeVisible();
|
|
|
|
await dialog.getByRole("button", { name: "Request changes" }).click();
|
|
await dialog.getByRole("button", { name: "Submit review" }).click();
|
|
|
|
await expect(page.getByText("Review submitted")).toBeVisible();
|
|
});
|
|
|
|
test("closing the pull request asks for confirmation", async ({ page }) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
await workspacePage.mockRPC(
|
|
"close-pull-request",
|
|
"pull-requests/close-pull-request.json",
|
|
);
|
|
await workspacePage.goToWorkspace({ extraParams: `&pr-id=${PR_ID}` });
|
|
|
|
const banner = reviewBar(page);
|
|
await banner.getByRole("button", { name: "Options" }).click();
|
|
await page.getByText("Cancel review").click();
|
|
|
|
// nothing is closed yet: a confirmation dialog takes over
|
|
await expect(page.getByText("will be cancelled")).toBeVisible();
|
|
|
|
// confirming closes the pull request; being inside its sandbox, the
|
|
// user is taken back to the file (no pr-id in the url)
|
|
await page.getByRole("button", { name: "Cancel design review" }).click();
|
|
await expect(page).not.toHaveURL(/pr-id/);
|
|
});
|
|
|
|
test("on a branch, requesting a review is the primary action", async ({
|
|
page,
|
|
}) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
// the open file IS a branch without an open pull request
|
|
await workspacePage.mockRPCs({
|
|
"get-file-branch-info?file-id=*":
|
|
"pull-requests/get-file-branch-info-branch.json",
|
|
"get-file-pull-requests?file-id=*":
|
|
"pull-requests/get-file-branches-empty.json",
|
|
});
|
|
await workspacePage.goToWorkspace();
|
|
|
|
// merging moved behind the kebab menu; requesting a review is primary
|
|
await expect(
|
|
page.getByRole("button", { name: "Request review" }),
|
|
).toBeVisible();
|
|
await expect(
|
|
page.getByRole("button", { name: "Merge to main" }),
|
|
).toBeHidden();
|
|
|
|
const banner = page.locator("#branch-banner");
|
|
await banner.getByRole("button", { name: "Options" }).click();
|
|
await page.getByText("Merge to main").click();
|
|
await expect(page.getByText("Merge into main")).toBeVisible();
|
|
});
|
|
|
|
test("exiting the review takes the user back to the file", async ({ page }) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
await workspacePage.goToWorkspace({ extraParams: `&pr-id=${PR_ID}` });
|
|
|
|
const banner = reviewBar(page);
|
|
await expect(banner).toBeVisible();
|
|
await banner.getByRole("button", { name: "Options" }).click();
|
|
await page.getByText("Exit review").click();
|
|
|
|
// exiting drops the review context and the pr-id param; the file (the
|
|
// live branch) stays as it was
|
|
await expect(page).not.toHaveURL(/pr-id/);
|
|
await expect(reviewBar(page)).toBeHidden();
|
|
});
|
|
|
|
test("during a review the header names the branch under review", async ({
|
|
page,
|
|
}) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
// the review link opens the author's branch
|
|
await workspacePage.mockRPC(
|
|
"get-file-branch-info?file-id=*",
|
|
"pull-requests/get-file-branch-info-branch.json",
|
|
);
|
|
await workspacePage.goToWorkspace({ extraParams: `&pr-id=${PR_ID}` });
|
|
|
|
// the review bar replaces the branch bar, so the header loads the
|
|
// branch context itself
|
|
await expect(reviewBar(page)).toBeVisible();
|
|
await expect(page.getByTitle("On branch checkout from main")).toBeVisible();
|
|
});
|
|
|
|
test("a branch that cannot be compared with main says so", async ({ page }) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
// the backend answers nil counts when it cannot compare the branch
|
|
await workspacePage.mockRPC(
|
|
"get-file-branch-info?file-id=*",
|
|
"pull-requests/get-file-branch-info-uncompared.json",
|
|
);
|
|
await workspacePage.goToWorkspace();
|
|
|
|
const banner = page.locator("#branch-banner");
|
|
await expect(
|
|
banner.getByText("Couldn't compare this branch with main"),
|
|
).toBeVisible();
|
|
await expect(banner.getByText("Up to date with main")).toBeHidden();
|
|
});
|
|
|
|
test("on a branch, the all-branches dialog offers no new branch", async ({
|
|
page,
|
|
}) => {
|
|
const workspacePage = new WorkspacePage(page);
|
|
await setupPullRequestSandbox(workspacePage);
|
|
await workspacePage.mockRPC(
|
|
"get-file-branch-info?file-id=*",
|
|
"pull-requests/get-file-branch-info-branch.json",
|
|
);
|
|
await workspacePage.goToWorkspace();
|
|
|
|
await page.getByTitle("On branch checkout from main").click();
|
|
await page.getByText("All branches").click();
|
|
|
|
// branches only grow from main: the button stays, disabled
|
|
await expect(page.getByRole("button", { name: "New branch" })).toBeDisabled();
|
|
});
|