Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/theme-v2/css/tables.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,16 @@ td {
mask-image: url("../images/gfs-chevron-up.svg")
}

.idea-board-notes-child-surface {
margin-left: calc(var(--space-14) * 2);
max-width: calc(100% - (var(--space-14) * 2))
}

.idea-board-notes-child-actions {
padding-left: var(--space-14);
padding-top: var(--space-10)
}

.tool-form-table {
table-layout: fixed;
width: 100%
Expand Down
41 changes: 40 additions & 1 deletion tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page }) => {
const server = await startRepoServer();
const previousApiUrl = process.env.GAMEFOUNDRY_API_URL;
Expand DownExpand Up@@ -130,7 +167,7 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(page.locator("[data-idea-board-expanded-row='top-thoughts'] > td > .content-stack")).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table='top-thoughts'] th[scope='col']")).toHaveText(["Note", "Actions"]);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Type" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created By" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created" })).toHaveCount(0);
Expand All@@ -141,13 +178,15 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(systemNote.locator("[data-idea-board-note-action='delete']")).toHaveCount(0);
await systemNote.locator("[data-idea-board-note-action='edit']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("System note can be edited in-place.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("System note can be edited in-place.");
await expect(page.locator("[data-idea-board-system-note] [data-idea-board-note-action='delete']")).toHaveCount(0);

await page.locator("[data-idea-board-add-note='top-thoughts']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("Add a fourth table-shaped note.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("Add a fourth table-shaped note.");
Expand Down
39 changes: 38 additions & 1 deletion tests/playwright/tools/ToolboxRoutePages.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("tools route aliases render toolbox tool pages", async ({ page }) => {
const server = await startRepoServer();
const failedRequests = [];
Expand DownExpand Up@@ -289,7 +326,7 @@ test("Idea Board launches from Toolbox with accordion table notes model", async
await expect(page.getByText("Selected")).toHaveCount(0);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toBeVisible();
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-create-project]")).toBeVisible();
await expect(page.locator("[data-idea-board-create-project]")).toBeDisabled();
await expect(page.locator("style, [style], script:not([src])")).toHaveCount(0);
Expand Down
10 changes: 7 additions & 3 deletions toolbox/idea-board/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ function renderExpandedNotesRow(tbody, record) {
const content = document.createElement("td");
content.colSpan = 6;

const childSurface = document.createElement("div");
childSurface.className = "idea-board-notes-child-surface";

const tableWrapper = document.createElement("div");
tableWrapper.className = "table-wrapper";
const notesTable = document.createElement("table");
Expand All@@ -281,7 +284,7 @@ function renderExpandedNotesRow(tbody, record) {
notesBody.dataset.ideaBoardNotesBody = record.ideaId;
notesTable.append(notesBody);
tableWrapper.append(notesTable);
content.append(tableWrapper);
childSurface.append(tableWrapper);

for (const note of notesForIdea(record.ideaId)) {
if (state.editingNoteId === note.noteId) {
Expand All@@ -293,11 +296,12 @@ function renderExpandedNotesRow(tbody, record) {
if (state.addingNoteIdeaId === record.ideaId) renderNoteInputRow(notesBody, record.ideaId);

const controls = document.createElement("div");
controls.className = "action-group";
controls.className = "action-group idea-board-notes-child-actions";
const addNote = actionButton("Add Note", "add", "ideaBoardNoteAction", "primary");
addNote.dataset.ideaBoardAddNote = record.ideaId;
controls.append(addNote);
content.append(controls);
childSurface.append(controls);
content.append(childSurface);

row.append(content);
tbody.append(row);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/theme-v2/css/tables.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,16 @@ td {
mask-image: url("../images/gfs-chevron-up.svg")
}

.idea-board-notes-child-surface {
margin-left: calc(var(--space-14) * 2);
max-width: calc(100% - (var(--space-14) * 2))
}

.idea-board-notes-child-actions {
padding-left: var(--space-14);
padding-top: var(--space-10)
}

.tool-form-table {
table-layout: fixed;
width: 100%
Expand Down
41 changes: 40 additions & 1 deletion tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page }) => {
const server = await startRepoServer();
const previousApiUrl = process.env.GAMEFOUNDRY_API_URL;
Expand DownExpand Up@@ -130,7 +167,7 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(page.locator("[data-idea-board-expanded-row='top-thoughts'] > td > .content-stack")).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table='top-thoughts'] th[scope='col']")).toHaveText(["Note", "Actions"]);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Type" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created By" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created" })).toHaveCount(0);
Expand All@@ -141,13 +178,15 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(systemNote.locator("[data-idea-board-note-action='delete']")).toHaveCount(0);
await systemNote.locator("[data-idea-board-note-action='edit']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("System note can be edited in-place.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("System note can be edited in-place.");
await expect(page.locator("[data-idea-board-system-note] [data-idea-board-note-action='delete']")).toHaveCount(0);

await page.locator("[data-idea-board-add-note='top-thoughts']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("Add a fourth table-shaped note.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("Add a fourth table-shaped note.");
Expand Down
39 changes: 38 additions & 1 deletion tests/playwright/tools/ToolboxRoutePages.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("tools route aliases render toolbox tool pages", async ({ page }) => {
const server = await startRepoServer();
const failedRequests = [];
Expand DownExpand Up@@ -289,7 +326,7 @@ test("Idea Board launches from Toolbox with accordion table notes model", async
await expect(page.getByText("Selected")).toHaveCount(0);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toBeVisible();
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-create-project]")).toBeVisible();
await expect(page.locator("[data-idea-board-create-project]")).toBeDisabled();
await expect(page.locator("style, [style], script:not([src])")).toHaveCount(0);
Expand Down
10 changes: 7 additions & 3 deletions toolbox/idea-board/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ function renderExpandedNotesRow(tbody, record) {
const content = document.createElement("td");
content.colSpan = 6;

const childSurface = document.createElement("div");
childSurface.className = "idea-board-notes-child-surface";

const tableWrapper = document.createElement("div");
tableWrapper.className = "table-wrapper";
const notesTable = document.createElement("table");
Expand All@@ -281,7 +284,7 @@ function renderExpandedNotesRow(tbody, record) {
notesBody.dataset.ideaBoardNotesBody = record.ideaId;
notesTable.append(notesBody);
tableWrapper.append(notesTable);
content.append(tableWrapper);
childSurface.append(tableWrapper);

for (const note of notesForIdea(record.ideaId)) {
if (state.editingNoteId === note.noteId) {
Expand All@@ -293,11 +296,12 @@ function renderExpandedNotesRow(tbody, record) {
if (state.addingNoteIdeaId === record.ideaId) renderNoteInputRow(notesBody, record.ideaId);

const controls = document.createElement("div");
controls.className = "action-group";
controls.className = "action-group idea-board-notes-child-actions";
const addNote = actionButton("Add Note", "add", "ideaBoardNoteAction", "primary");
addNote.dataset.ideaBoardAddNote = record.ideaId;
controls.append(addNote);
content.append(controls);
childSurface.append(controls);
content.append(childSurface);

row.append(content);
tbody.append(row);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/theme-v2/css/tables.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,16 @@ td {
mask-image: url("../images/gfs-chevron-up.svg")
}

.idea-board-notes-child-surface {
margin-left: calc(var(--space-14) * 2);
max-width: calc(100% - (var(--space-14) * 2))
}

.idea-board-notes-child-actions {
padding-left: var(--space-14);
padding-top: var(--space-10)
}

.tool-form-table {
table-layout: fixed;
width: 100%
Expand Down
41 changes: 40 additions & 1 deletion tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page }) => {
const server = await startRepoServer();
const previousApiUrl = process.env.GAMEFOUNDRY_API_URL;
Expand DownExpand Up@@ -130,7 +167,7 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(page.locator("[data-idea-board-expanded-row='top-thoughts'] > td > .content-stack")).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table='top-thoughts'] th[scope='col']")).toHaveText(["Note", "Actions"]);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Type" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created By" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created" })).toHaveCount(0);
Expand All@@ -141,13 +178,15 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(systemNote.locator("[data-idea-board-note-action='delete']")).toHaveCount(0);
await systemNote.locator("[data-idea-board-note-action='edit']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("System note can be edited in-place.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("System note can be edited in-place.");
await expect(page.locator("[data-idea-board-system-note] [data-idea-board-note-action='delete']")).toHaveCount(0);

await page.locator("[data-idea-board-add-note='top-thoughts']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("Add a fourth table-shaped note.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("Add a fourth table-shaped note.");
Expand Down
39 changes: 38 additions & 1 deletion tests/playwright/tools/ToolboxRoutePages.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("tools route aliases render toolbox tool pages", async ({ page }) => {
const server = await startRepoServer();
const failedRequests = [];
Expand DownExpand Up@@ -289,7 +326,7 @@ test("Idea Board launches from Toolbox with accordion table notes model", async
await expect(page.getByText("Selected")).toHaveCount(0);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toBeVisible();
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-create-project]")).toBeVisible();
await expect(page.locator("[data-idea-board-create-project]")).toBeDisabled();
await expect(page.locator("style, [style], script:not([src])")).toHaveCount(0);
Expand Down
10 changes: 7 additions & 3 deletions toolbox/idea-board/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ function renderExpandedNotesRow(tbody, record) {
const content = document.createElement("td");
content.colSpan = 6;

const childSurface = document.createElement("div");
childSurface.className = "idea-board-notes-child-surface";

const tableWrapper = document.createElement("div");
tableWrapper.className = "table-wrapper";
const notesTable = document.createElement("table");
Expand All@@ -281,7 +284,7 @@ function renderExpandedNotesRow(tbody, record) {
notesBody.dataset.ideaBoardNotesBody = record.ideaId;
notesTable.append(notesBody);
tableWrapper.append(notesTable);
content.append(tableWrapper);
childSurface.append(tableWrapper);

for (const note of notesForIdea(record.ideaId)) {
if (state.editingNoteId === note.noteId) {
Expand All@@ -293,11 +296,12 @@ function renderExpandedNotesRow(tbody, record) {
if (state.addingNoteIdeaId === record.ideaId) renderNoteInputRow(notesBody, record.ideaId);

const controls = document.createElement("div");
controls.className = "action-group";
controls.className = "action-group idea-board-notes-child-actions";
const addNote = actionButton("Add Note", "add", "ideaBoardNoteAction", "primary");
addNote.dataset.ideaBoardAddNote = record.ideaId;
controls.append(addNote);
content.append(controls);
childSurface.append(controls);
content.append(childSurface);

row.append(content);
tbody.append(row);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/theme-v2/css/tables.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,16 @@ td {
mask-image: url("../images/gfs-chevron-up.svg")
}

.idea-board-notes-child-surface {
margin-left: calc(var(--space-14) * 2);
max-width: calc(100% - (var(--space-14) * 2))
}

.idea-board-notes-child-actions {
padding-left: var(--space-14);
padding-top: var(--space-10)
}

.tool-form-table {
table-layout: fixed;
width: 100%
Expand Down
41 changes: 40 additions & 1 deletion tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page }) => {
const server = await startRepoServer();
const previousApiUrl = process.env.GAMEFOUNDRY_API_URL;
Expand DownExpand Up@@ -130,7 +167,7 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(page.locator("[data-idea-board-expanded-row='top-thoughts'] > td > .content-stack")).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table='top-thoughts'] th[scope='col']")).toHaveText(["Note", "Actions"]);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Type" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created By" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created" })).toHaveCount(0);
Expand All@@ -141,13 +178,15 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(systemNote.locator("[data-idea-board-note-action='delete']")).toHaveCount(0);
await systemNote.locator("[data-idea-board-note-action='edit']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("System note can be edited in-place.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("System note can be edited in-place.");
await expect(page.locator("[data-idea-board-system-note] [data-idea-board-note-action='delete']")).toHaveCount(0);

await page.locator("[data-idea-board-add-note='top-thoughts']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("Add a fourth table-shaped note.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("Add a fourth table-shaped note.");
Expand Down
39 changes: 38 additions & 1 deletion tests/playwright/tools/ToolboxRoutePages.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("tools route aliases render toolbox tool pages", async ({ page }) => {
const server = await startRepoServer();
const failedRequests = [];
Expand DownExpand Up@@ -289,7 +326,7 @@ test("Idea Board launches from Toolbox with accordion table notes model", async
await expect(page.getByText("Selected")).toHaveCount(0);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toBeVisible();
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-create-project]")).toBeVisible();
await expect(page.locator("[data-idea-board-create-project]")).toBeDisabled();
await expect(page.locator("style, [style], script:not([src])")).toHaveCount(0);
Expand Down
10 changes: 7 additions & 3 deletions toolbox/idea-board/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ function renderExpandedNotesRow(tbody, record) {
const content = document.createElement("td");
content.colSpan = 6;

const childSurface = document.createElement("div");
childSurface.className = "idea-board-notes-child-surface";

const tableWrapper = document.createElement("div");
tableWrapper.className = "table-wrapper";
const notesTable = document.createElement("table");
Expand All@@ -281,7 +284,7 @@ function renderExpandedNotesRow(tbody, record) {
notesBody.dataset.ideaBoardNotesBody = record.ideaId;
notesTable.append(notesBody);
tableWrapper.append(notesTable);
content.append(tableWrapper);
childSurface.append(tableWrapper);

for (const note of notesForIdea(record.ideaId)) {
if (state.editingNoteId === note.noteId) {
Expand All@@ -293,11 +296,12 @@ function renderExpandedNotesRow(tbody, record) {
if (state.addingNoteIdeaId === record.ideaId) renderNoteInputRow(notesBody, record.ideaId);

const controls = document.createElement("div");
controls.className = "action-group";
controls.className = "action-group idea-board-notes-child-actions";
const addNote = actionButton("Add Note", "add", "ideaBoardNoteAction", "primary");
addNote.dataset.ideaBoardAddNote = record.ideaId;
controls.append(addNote);
content.append(controls);
childSurface.append(controls);
content.append(childSurface);

row.append(content);
tbody.append(row);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/theme-v2/css/tables.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,16 @@ td {
mask-image: url("../images/gfs-chevron-up.svg")
}

.idea-board-notes-child-surface {
margin-left: calc(var(--space-14) * 2);
max-width: calc(100% - (var(--space-14) * 2))
}

.idea-board-notes-child-actions {
padding-left: var(--space-14);
padding-top: var(--space-10)
}

.tool-form-table {
table-layout: fixed;
width: 100%
Expand Down
41 changes: 40 additions & 1 deletion tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page }) => {
const server = await startRepoServer();
const previousApiUrl = process.env.GAMEFOUNDRY_API_URL;
Expand DownExpand Up@@ -130,7 +167,7 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(page.locator("[data-idea-board-expanded-row='top-thoughts'] > td > .content-stack")).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table='top-thoughts'] th[scope='col']")).toHaveText(["Note", "Actions"]);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Type" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created By" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created" })).toHaveCount(0);
Expand All@@ -141,13 +178,15 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(systemNote.locator("[data-idea-board-note-action='delete']")).toHaveCount(0);
await systemNote.locator("[data-idea-board-note-action='edit']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("System note can be edited in-place.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("System note can be edited in-place.");
await expect(page.locator("[data-idea-board-system-note] [data-idea-board-note-action='delete']")).toHaveCount(0);

await page.locator("[data-idea-board-add-note='top-thoughts']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("Add a fourth table-shaped note.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("Add a fourth table-shaped note.");
Expand Down
39 changes: 38 additions & 1 deletion tests/playwright/tools/ToolboxRoutePages.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("tools route aliases render toolbox tool pages", async ({ page }) => {
const server = await startRepoServer();
const failedRequests = [];
Expand DownExpand Up@@ -289,7 +326,7 @@ test("Idea Board launches from Toolbox with accordion table notes model", async
await expect(page.getByText("Selected")).toHaveCount(0);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toBeVisible();
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-create-project]")).toBeVisible();
await expect(page.locator("[data-idea-board-create-project]")).toBeDisabled();
await expect(page.locator("style, [style], script:not([src])")).toHaveCount(0);
Expand Down
10 changes: 7 additions & 3 deletions toolbox/idea-board/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ function renderExpandedNotesRow(tbody, record) {
const content = document.createElement("td");
content.colSpan = 6;

const childSurface = document.createElement("div");
childSurface.className = "idea-board-notes-child-surface";

const tableWrapper = document.createElement("div");
tableWrapper.className = "table-wrapper";
const notesTable = document.createElement("table");
Expand All@@ -281,7 +284,7 @@ function renderExpandedNotesRow(tbody, record) {
notesBody.dataset.ideaBoardNotesBody = record.ideaId;
notesTable.append(notesBody);
tableWrapper.append(notesTable);
content.append(tableWrapper);
childSurface.append(tableWrapper);

for (const note of notesForIdea(record.ideaId)) {
if (state.editingNoteId === note.noteId) {
Expand All@@ -293,11 +296,12 @@ function renderExpandedNotesRow(tbody, record) {
if (state.addingNoteIdeaId === record.ideaId) renderNoteInputRow(notesBody, record.ideaId);

const controls = document.createElement("div");
controls.className = "action-group";
controls.className = "action-group idea-board-notes-child-actions";
const addNote = actionButton("Add Note", "add", "ideaBoardNoteAction", "primary");
addNote.dataset.ideaBoardAddNote = record.ideaId;
controls.append(addNote);
content.append(controls);
childSurface.append(controls);
content.append(childSurface);

row.append(content);
tbody.append(row);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/theme-v2/css/tables.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,16 @@ td {
mask-image: url("../images/gfs-chevron-up.svg")
}

.idea-board-notes-child-surface {
margin-left: calc(var(--space-14) * 2);
max-width: calc(100% - (var(--space-14) * 2))
}

.idea-board-notes-child-actions {
padding-left: var(--space-14);
padding-top: var(--space-10)
}

.tool-form-table {
table-layout: fixed;
width: 100%
Expand Down
41 changes: 40 additions & 1 deletion tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page }) => {
const server = await startRepoServer();
const previousApiUrl = process.env.GAMEFOUNDRY_API_URL;
Expand DownExpand Up@@ -130,7 +167,7 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(page.locator("[data-idea-board-expanded-row='top-thoughts'] > td > .content-stack")).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table='top-thoughts'] th[scope='col']")).toHaveText(["Note", "Actions"]);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Type" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created By" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created" })).toHaveCount(0);
Expand All@@ -141,13 +178,15 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(systemNote.locator("[data-idea-board-note-action='delete']")).toHaveCount(0);
await systemNote.locator("[data-idea-board-note-action='edit']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("System note can be edited in-place.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("System note can be edited in-place.");
await expect(page.locator("[data-idea-board-system-note] [data-idea-board-note-action='delete']")).toHaveCount(0);

await page.locator("[data-idea-board-add-note='top-thoughts']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("Add a fourth table-shaped note.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("Add a fourth table-shaped note.");
Expand Down
39 changes: 38 additions & 1 deletion tests/playwright/tools/ToolboxRoutePages.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("tools route aliases render toolbox tool pages", async ({ page }) => {
const server = await startRepoServer();
const failedRequests = [];
Expand DownExpand Up@@ -289,7 +326,7 @@ test("Idea Board launches from Toolbox with accordion table notes model", async
await expect(page.getByText("Selected")).toHaveCount(0);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toBeVisible();
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-create-project]")).toBeVisible();
await expect(page.locator("[data-idea-board-create-project]")).toBeDisabled();
await expect(page.locator("style, [style], script:not([src])")).toHaveCount(0);
Expand Down
10 changes: 7 additions & 3 deletions toolbox/idea-board/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ function renderExpandedNotesRow(tbody, record) {
const content = document.createElement("td");
content.colSpan = 6;

const childSurface = document.createElement("div");
childSurface.className = "idea-board-notes-child-surface";

const tableWrapper = document.createElement("div");
tableWrapper.className = "table-wrapper";
const notesTable = document.createElement("table");
Expand All@@ -281,7 +284,7 @@ function renderExpandedNotesRow(tbody, record) {
notesBody.dataset.ideaBoardNotesBody = record.ideaId;
notesTable.append(notesBody);
tableWrapper.append(notesTable);
content.append(tableWrapper);
childSurface.append(tableWrapper);

for (const note of notesForIdea(record.ideaId)) {
if (state.editingNoteId === note.noteId) {
Expand All@@ -293,11 +296,12 @@ function renderExpandedNotesRow(tbody, record) {
if (state.addingNoteIdeaId === record.ideaId) renderNoteInputRow(notesBody, record.ideaId);

const controls = document.createElement("div");
controls.className = "action-group";
controls.className = "action-group idea-board-notes-child-actions";
const addNote = actionButton("Add Note", "add", "ideaBoardNoteAction", "primary");
addNote.dataset.ideaBoardAddNote = record.ideaId;
controls.append(addNote);
content.append(controls);
childSurface.append(controls);
content.append(childSurface);

row.append(content);
tbody.append(row);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/theme-v2/css/tables.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,16 @@ td {
mask-image: url("../images/gfs-chevron-up.svg")
}

.idea-board-notes-child-surface {
margin-left: calc(var(--space-14) * 2);
max-width: calc(100% - (var(--space-14) * 2))
}

.idea-board-notes-child-actions {
padding-left: var(--space-14);
padding-top: var(--space-10)
}

.tool-form-table {
table-layout: fixed;
width: 100%
Expand Down
41 changes: 40 additions & 1 deletion tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page }) => {
const server = await startRepoServer();
const previousApiUrl = process.env.GAMEFOUNDRY_API_URL;
Expand DownExpand Up@@ -130,7 +167,7 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(page.locator("[data-idea-board-expanded-row='top-thoughts'] > td > .content-stack")).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table='top-thoughts'] th[scope='col']")).toHaveText(["Note", "Actions"]);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Type" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created By" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created" })).toHaveCount(0);
Expand All@@ -141,13 +178,15 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(systemNote.locator("[data-idea-board-note-action='delete']")).toHaveCount(0);
await systemNote.locator("[data-idea-board-note-action='edit']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("System note can be edited in-place.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("System note can be edited in-place.");
await expect(page.locator("[data-idea-board-system-note] [data-idea-board-note-action='delete']")).toHaveCount(0);

await page.locator("[data-idea-board-add-note='top-thoughts']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("Add a fourth table-shaped note.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("Add a fourth table-shaped note.");
Expand Down
39 changes: 38 additions & 1 deletion tests/playwright/tools/ToolboxRoutePages.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("tools route aliases render toolbox tool pages", async ({ page }) => {
const server = await startRepoServer();
const failedRequests = [];
Expand DownExpand Up@@ -289,7 +326,7 @@ test("Idea Board launches from Toolbox with accordion table notes model", async
await expect(page.getByText("Selected")).toHaveCount(0);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toBeVisible();
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-create-project]")).toBeVisible();
await expect(page.locator("[data-idea-board-create-project]")).toBeDisabled();
await expect(page.locator("style, [style], script:not([src])")).toHaveCount(0);
Expand Down
10 changes: 7 additions & 3 deletions toolbox/idea-board/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ function renderExpandedNotesRow(tbody, record) {
const content = document.createElement("td");
content.colSpan = 6;

const childSurface = document.createElement("div");
childSurface.className = "idea-board-notes-child-surface";

const tableWrapper = document.createElement("div");
tableWrapper.className = "table-wrapper";
const notesTable = document.createElement("table");
Expand All@@ -281,7 +284,7 @@ function renderExpandedNotesRow(tbody, record) {
notesBody.dataset.ideaBoardNotesBody = record.ideaId;
notesTable.append(notesBody);
tableWrapper.append(notesTable);
content.append(tableWrapper);
childSurface.append(tableWrapper);

for (const note of notesForIdea(record.ideaId)) {
if (state.editingNoteId === note.noteId) {
Expand All@@ -293,11 +296,12 @@ function renderExpandedNotesRow(tbody, record) {
if (state.addingNoteIdeaId === record.ideaId) renderNoteInputRow(notesBody, record.ideaId);

const controls = document.createElement("div");
controls.className = "action-group";
controls.className = "action-group idea-board-notes-child-actions";
const addNote = actionButton("Add Note", "add", "ideaBoardNoteAction", "primary");
addNote.dataset.ideaBoardAddNote = record.ideaId;
controls.append(addNote);
content.append(controls);
childSurface.append(controls);
content.append(childSurface);

row.append(content);
tbody.append(row);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/theme-v2/css/tables.css
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,16 @@ td {
mask-image: url("../images/gfs-chevron-up.svg")
}

.idea-board-notes-child-surface {
margin-left: calc(var(--space-14) * 2);
max-width: calc(100% - (var(--space-14) * 2))
}

.idea-board-notes-child-actions {
padding-left: var(--space-14);
padding-top: var(--space-10)
}

.tool-form-table {
table-layout: fixed;
width: 100%
Expand Down
41 changes: 40 additions & 1 deletion tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,6 +53,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page }) => {
const server = await startRepoServer();
const previousApiUrl = process.env.GAMEFOUNDRY_API_URL;
Expand DownExpand Up@@ -130,7 +167,7 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(page.locator("[data-idea-board-expanded-row='top-thoughts'] > td > .content-stack")).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table='top-thoughts'] th[scope='col']")).toHaveText(["Note", "Actions"]);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Type" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created By" })).toHaveCount(0);
await expect(page.locator("[data-idea-board-notes-table] th[scope='col']", { hasText: "Created" })).toHaveCount(0);
Expand All@@ -141,13 +178,15 @@ test("Idea Board uses DB-shaped accordion table ideas and notes", async ({ page
await expect(systemNote.locator("[data-idea-board-note-action='delete']")).toHaveCount(0);
await systemNote.locator("[data-idea-board-note-action='edit']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("System note can be edited in-place.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("System note can be edited in-place.");
await expect(page.locator("[data-idea-board-system-note] [data-idea-board-note-action='delete']")).toHaveCount(0);

await page.locator("[data-idea-board-add-note='top-thoughts']").click();
await expect(page.locator("[data-idea-board-note-input-row] [data-idea-board-note-action]")).toHaveText(["Save", "Cancel"]);
await expectExpandedNotesChildIndentation(page, "top-thoughts", 1);
await page.locator("[data-idea-board-note-input]").fill("Add a fourth table-shaped note.");
await page.locator("[data-idea-board-note-action='save']").click();
await expect(page.locator("[data-idea-board-notes-table='top-thoughts']")).toContainText("Add a fourth table-shaped note.");
Expand Down
39 changes: 38 additions & 1 deletion tests/playwright/tools/ToolboxRoutePages.spec.mjs
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,6 +155,43 @@ async function expectButtonLeftAligned(page, buttonSelector, containerSelector)
expect(metrics.buttonLeft).toBeLessThan(metrics.containerLeft + metrics.containerWidth / 2);
}

async function expectExpandedNotesChildIndentation(page, ideaId, expectedInputRows = 0) {
const metrics = await page.locator(`[data-idea-board-expanded-row='${ideaId}']`).evaluate((row, targetIdeaId) => {
const expandedCell = row.querySelector(":scope > td");
const childSurface = row.querySelector(".idea-board-notes-child-surface");
const noteCell = row.querySelector(`[data-idea-board-notes-table='${targetIdeaId}'] tbody tr td:first-child`);
const noteInput = row.querySelector("[data-idea-board-note-input]");
const addNote = row.querySelector(`[data-idea-board-add-note='${targetIdeaId}']`);
const addNoteActions = row.querySelector(".idea-board-notes-child-actions");
const expandedStyles = getComputedStyle(expandedCell);
const noteCellStyles = getComputedStyle(noteCell);
const addNoteActionStyles = getComputedStyle(addNoteActions);
const expandedRect = expandedCell.getBoundingClientRect();
const childRect = childSurface.getBoundingClientRect();
const noteCellRect = noteCell.getBoundingClientRect();
const expandedPadding = Number.parseFloat(expandedStyles.paddingLeft || "0");
const noteCellPadding = Number.parseFloat(noteCellStyles.paddingLeft || "0");
return {
addNoteLeft: addNote.getBoundingClientRect().left,
childSurfaceLeft: childRect.left,
expandedContentLeft: expandedRect.left + expandedPadding,
expectedContentLeft: expandedRect.left + 2 * (expandedPadding + noteCellPadding),
inputLeft: noteInput ? noteInput.getBoundingClientRect().left : null,
inputRows: row.querySelectorAll("[data-idea-board-note-input-row]").length,
noteContentLeft: noteCellRect.left + noteCellPadding,
actionContentLeft: addNoteActions.getBoundingClientRect().left + Number.parseFloat(addNoteActionStyles.paddingLeft || "0"),
};
}, ideaId);
expect(metrics.childSurfaceLeft).toBeGreaterThan(metrics.expandedContentLeft);
expect(Math.abs(metrics.noteContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.addNoteLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(Math.abs(metrics.actionContentLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
expect(metrics.inputRows).toBe(expectedInputRows);
if (expectedInputRows > 0) {
expect(Math.abs(metrics.inputLeft - metrics.expectedContentLeft)).toBeLessThanOrEqual(2);
}
}

test("tools route aliases render toolbox tool pages", async ({ page }) => {
const server = await startRepoServer();
const failedRequests = [];
Expand DownExpand Up@@ -289,7 +326,7 @@ test("Idea Board launches from Toolbox with accordion table notes model", async
await expect(page.getByText("Selected")).toHaveCount(0);
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toBeVisible();
await expect(page.locator("[data-idea-board-add-note='top-thoughts']")).toHaveText("Add Note");
await expectButtonLeftAligned(page, "[data-idea-board-add-note='top-thoughts']", "[data-idea-board-expanded-row='top-thoughts'] > td");
await expectExpandedNotesChildIndentation(page, "top-thoughts");
await expect(page.locator("[data-idea-board-create-project]")).toBeVisible();
await expect(page.locator("[data-idea-board-create-project]")).toBeDisabled();
await expect(page.locator("style, [style], script:not([src])")).toHaveCount(0);
Expand Down
10 changes: 7 additions & 3 deletions toolbox/idea-board/index.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ function renderExpandedNotesRow(tbody, record) {
const content = document.createElement("td");
content.colSpan = 6;

const childSurface = document.createElement("div");
childSurface.className = "idea-board-notes-child-surface";

const tableWrapper = document.createElement("div");
tableWrapper.className = "table-wrapper";
const notesTable = document.createElement("table");
Expand All@@ -281,7 +284,7 @@ function renderExpandedNotesRow(tbody, record) {
notesBody.dataset.ideaBoardNotesBody = record.ideaId;
notesTable.append(notesBody);
tableWrapper.append(notesTable);
content.append(tableWrapper);
childSurface.append(tableWrapper);

for (const note of notesForIdea(record.ideaId)) {
if (state.editingNoteId === note.noteId) {
Expand All@@ -293,11 +296,12 @@ function renderExpandedNotesRow(tbody, record) {
if (state.addingNoteIdeaId === record.ideaId) renderNoteInputRow(notesBody, record.ideaId);

const controls = document.createElement("div");
controls.className = "action-group";
controls.className = "action-group idea-board-notes-child-actions";
const addNote = actionButton("Add Note", "add", "ideaBoardNoteAction", "primary");
addNote.dataset.ideaBoardAddNote = record.ideaId;
controls.append(addNote);
content.append(controls);
childSurface.append(controls);
content.append(childSurface);

row.append(content);
tbody.append(row);
Expand Down
Loading