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
23 changes: 11 additions & 12 deletions src/engineering_platform/assets/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -3480,13 +3480,13 @@ function formatComponentDatabaseSize(value) {
maximumFractionDigits: 1,
}) + " MB";
}
function componentDetailField(list, label, value, { localPath = false } = {}) {
function componentDetailField(list, label, value) {
if (value === null || value === undefined || value === "") return;
const term = document.createElement("dt"),
description = document.createElement("dd"),
entry = document.createElement("div");
term.textContent = label;
if (localPath && typeof value === "string" && value.startsWith("/"))
if (typeof value === "string" && value.startsWith("/"))
description.append(localFilesystemLink(value));
else description.textContent = String(value);
entry.append(term, description);
Expand Down Expand Up @@ -3544,7 +3544,7 @@ function showComponentModal(payload) {
if (payload.kind === "TRANSPORT") {
const transportTimestamp = (value) => value ? formatTimestamp(value) : null;
componentDetailField(fields, t("transport.last_submission"), transportTimestamp(payload.last_successful_submission));
componentDetailField(fields, t("transport.location"), payload.watched_location, { localPath: true });
componentDetailField(fields, t("transport.location"), payload.watched_location);
componentDetailField(fields, t("transport.heartbeat"), transportTimestamp(payload.heartbeat));
componentDetailField(fields, t("transport.delivery_retry"), payload.delivery_retry ? t("transport.retry." + payload.delivery_retry, {}, String(payload.delivery_retry)) : null);
componentDetailField(fields, t("transport.quarantine"), payload.quarantine_count);
Expand All @@ -3562,14 +3562,13 @@ function showComponentModal(payload) {
Array.isArray(launchd.program_arguments) && launchd.program_arguments.length
? launchd.program_arguments[0]
: payload.executable_path,
{ localPath: true },
);
componentDetailField(fields, t("component.launchd_label"), launchd.label);
componentDetailField(fields, t("component.lifecycle_owner"), launchd.label ? t("component.launch_agent") : null);
componentDetailField(fields, t("component.lifecycle_status"), launchdLifecycleState(launchd));
componentDetailField(fields, t("component.process_id"), launchd.pid);
componentDetailField(fields, t("component.last_stopped"), launchdLastStopped(launchd));
componentDetailField(fields, t("component.launch_agent"), launchd.plist_path, { localPath: true });
componentDetailField(fields, t("component.launch_agent"), launchd.plist_path);
componentDetailField(
fields,
t("component.launchd_configuration"),
Expand All @@ -3586,13 +3585,13 @@ function showComponentModal(payload) {
} else {
componentDetailField(fields, t("component.process_status"), componentProcessStatus(payload));
}
componentDetailField(fields, t("component.runtime_path"), installation.runtime_path, { localPath: true });
componentDetailField(fields, t("component.central_data_path"), installation.central_data_path, { localPath: true });
componentDetailField(fields, t("component.database_path"), installation.database_path, { localPath: true });
componentDetailField(fields, t("component.runtime_path"), installation.runtime_path);
componentDetailField(fields, t("component.central_data_path"), installation.central_data_path);
componentDetailField(fields, t("component.database_path"), installation.database_path);
componentDetailField(fields, t("workspace.database_size"), formatComponentDatabaseSize(payload.database_size_bytes));
componentDetailField(fields, t("component.launch_agent"), installation.launch_agent_path, { localPath: true });
componentDetailField(fields, t("component.error_log_path"), installation.error_log_path, { localPath: true });
componentDetailField(fields, t("component.relay_binary_path"), installation.relay_binary_path, { localPath: true });
componentDetailField(fields, t("component.launch_agent"), installation.launch_agent_path);
componentDetailField(fields, t("component.error_log_path"), installation.error_log_path);
componentDetailField(fields, t("component.relay_binary_path"), installation.relay_binary_path);
content.append(fields);
restart.hidden = !payload.restart_supported;
restart.dataset.component = payload.component;
Expand Down Expand Up @@ -7151,7 +7150,7 @@ function detailField(label, value, preformatted = false, folder = false) {
name.className = "label";
name.textContent = label;
const supplied = String(value ?? "—");
const content = folder && supplied.startsWith("/") ? localFilesystemLink(supplied) : output;
const content = supplied.startsWith("/") ? localFilesystemLink(supplied) : output;
if (content === output) output.textContent = supplied;
field.append(name, content);
return field;
Expand Down
20 changes: 20 additions & 0 deletions tests/engineering/dashboard.spec.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4450,6 +4450,26 @@ test.describe("Engineering Status browser smoke", () => {
await expect(page.locator("#copyToast")).toHaveText("Pad gekopieerd naar klembord");
});

test("makes every local component-installation path a copy action", async ({ page }) => {
await page.goto(dashboardUrl, { waitUntil: "domcontentloaded" });
await page.evaluate(() => showComponentModal({
component: "ep_server", healthy: true,
launchd: { program_arguments: ["/private/tmp/ep-server"], plist_path: "/private/tmp/server.plist" },
installation: {
runtime_path: "/private/tmp/runtime",
central_data_path: "/private/tmp/central",
database_path: "/private/tmp/engineering.db",
launch_agent_path: "/private/tmp/installed-server.plist",
error_log_path: "/private/tmp/server.log",
},
}));
const paths = page.locator("#componentModalContent .local-folder-link");
await expect(paths).toHaveCount(7);
expect(await paths.evaluateAll((elements) => elements.every((element) => element.getAttribute("type") === "button"))).toBe(true);
await paths.filter({ hasText: "/private/tmp/engineering.db" }).click();
await expect(page.locator("#copyToast")).toHaveText("Pad gekopieerd naar klembord");
});

test("puts preflight diagnostic clauses on separate lines", async ({ page }) => {
await page.route("**/api/events", (route) => route.abort());
await page.route("**/api/dashboard-snapshot", (route) => route.abort());
Expand Down
Loading