feat(asset): add photos, monitor links and deletion
Apply asset_db_002_photos_monitors.sql before rebuilding web. Restrict soft deletion to the super admin; retain reports and audit.
This commit is contained in:
@@ -42,6 +42,32 @@ const users = [
|
||||
{ email: "reader@test.local", name: "담당자" },
|
||||
{ email: "staff@test.local", name: "직원" },
|
||||
];
|
||||
Object.assign(records[2], {
|
||||
name: "Registered Monitor",
|
||||
category: "monitor",
|
||||
model: "Test Display 24",
|
||||
serial: "synthetic-monitor-1",
|
||||
});
|
||||
const photoRecords = new Map(),
|
||||
monitorLinks = new Map();
|
||||
const photoPNG = Buffer.from(
|
||||
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+jR1kAAAAASUVORK5CYII=",
|
||||
"base64",
|
||||
);
|
||||
function monitorItems(a) {
|
||||
return [0, 1, 2].map((i) => ({
|
||||
index: i,
|
||||
name: "Test Display " + (i + 1),
|
||||
model: "Test Display 24",
|
||||
serial: i < 2 ? "synthetic-monitor-" + (i + 1) : "",
|
||||
manufacturer: "Test",
|
||||
asset:
|
||||
records.find((r) => r.id === monitorLinks.get(a.id + ":" + i)) ||
|
||||
(i === 0 ? records.find((r) => r.id === "asset2") : null),
|
||||
candidates:
|
||||
i === 2 ? [records.find((r) => r.id === "asset2")].filter(Boolean) : [],
|
||||
}));
|
||||
}
|
||||
const events = [
|
||||
{
|
||||
id: 1,
|
||||
@@ -94,9 +120,11 @@ const server = http.createServer(async (req, res) => {
|
||||
fs.readFileSync(
|
||||
path.join(
|
||||
OUT,
|
||||
url.searchParams.has("unconfigured")
|
||||
? "asset_unconfigured.html"
|
||||
: "asset_render.html",
|
||||
url.searchParams.has("super")
|
||||
? "asset_super.html"
|
||||
: url.searchParams.has("unconfigured")
|
||||
? "asset_unconfigured.html"
|
||||
: "asset_render.html",
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -243,9 +271,56 @@ const server = http.createServer(async (req, res) => {
|
||||
report: a.latest_report_id ? { ...reports[0], parsed } : null,
|
||||
reports: a.latest_report_id ? reports : [],
|
||||
events: events.filter((e) => e.asset_id === a.id),
|
||||
photos: photoRecords.get(a.id) || [],
|
||||
monitors: a.latest_report_id ? monitorItems(a) : [],
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (parts.length === 2 && req.method === "DELETE") {
|
||||
assert.equal(body.version, a.version);
|
||||
records.splice(records.indexOf(a), 1);
|
||||
json(res, { ok: true });
|
||||
return;
|
||||
}
|
||||
if (parts[2] === "photos" && parts.length === 3 && req.method === "POST") {
|
||||
const match = raw.toString().match(/name="version"\r\n\r\n(\d+)/);
|
||||
assert.equal(Number(match[1]), a.version);
|
||||
const photos = photoRecords.get(a.id) || [];
|
||||
photos.push({ id: "photo" + photos.length, filename: "test.png" });
|
||||
photoRecords.set(a.id, photos);
|
||||
a.version++;
|
||||
json(res, { id: photos.at(-1).id });
|
||||
return;
|
||||
}
|
||||
if (parts[2] === "photos" && parts.length === 4) {
|
||||
res.setHeader("Content-Type", "image/png");
|
||||
res.end(photoPNG);
|
||||
return;
|
||||
}
|
||||
if (parts[2] === "monitors" && req.method === "POST") {
|
||||
assert.equal(body.version, a.version);
|
||||
let target;
|
||||
if (body.asset) {
|
||||
target = {
|
||||
...records[1],
|
||||
...body.asset,
|
||||
id: "asset" + counter++,
|
||||
tag: "AST-MONITOR",
|
||||
version: 1,
|
||||
latest_report_id: null,
|
||||
specs: null,
|
||||
};
|
||||
records.push(target);
|
||||
} else target = records.find((r) => r.id === body.asset_id);
|
||||
monitorLinks.set(a.id + ":" + parts[3], target.id);
|
||||
a.version++;
|
||||
json(res, { id: target.id });
|
||||
return;
|
||||
}
|
||||
if (parts[2] === "reports" && parts[4] === "monitors") {
|
||||
json(res, { items: monitorItems(a) });
|
||||
return;
|
||||
}
|
||||
if (parts.length === 2 && req.method === "PUT") {
|
||||
if (conflict) {
|
||||
conflict = false;
|
||||
@@ -352,6 +427,19 @@ const server = http.createServer(async (req, res) => {
|
||||
);
|
||||
await page.locator('[data-open="asset0"][data-tab="specs"]').click();
|
||||
await page.locator("#am-spec-query").waitFor();
|
||||
assert.equal(
|
||||
await page.locator("[data-delete]").count(),
|
||||
0,
|
||||
"ordinary users must not see deletion",
|
||||
);
|
||||
assert.equal(await page.locator(".am-monitor-card").count(), 3);
|
||||
await page.locator('[data-monitor-open="asset2"]').click();
|
||||
await page
|
||||
.locator("#am-detail-title")
|
||||
.filter({ hasText: "Registered Monitor" })
|
||||
.waitFor();
|
||||
await page.locator("[data-return-computer]").click();
|
||||
await page.locator("#am-spec-query").waitFor();
|
||||
assert.ok(
|
||||
(await page.locator(".am-spec-card").first().textContent()).includes(
|
||||
parsed.summary.cpu,
|
||||
@@ -474,6 +562,50 @@ const server = http.createServer(async (req, res) => {
|
||||
.waitFor();
|
||||
assert.equal(await page.locator('[data-detail-tab="specs"]').count(), 0);
|
||||
await page.keyboard.press("Escape");
|
||||
// 모니터 등록과 연결이 끝나면 같은 화면에서 자산 개요를 확인할 수 있습니다.
|
||||
await page.goto(origin + "/asset/?asset=asset0&tab=specs");
|
||||
await page.locator('[data-monitor-create="1"]').waitFor();
|
||||
await page.locator('[data-monitor-create="1"]').click();
|
||||
assert.equal(
|
||||
await page.locator('#am-editor-form [name="category"]').inputValue(),
|
||||
"monitor",
|
||||
);
|
||||
assert.equal(
|
||||
await page.locator('#am-editor-form [name="category"]').isDisabled(),
|
||||
true,
|
||||
);
|
||||
await page.locator('#am-editor-form [name="name"]').fill("New Monitor");
|
||||
await page.locator('#am-editor-form [type="submit"]').click();
|
||||
await page.waitForFunction(
|
||||
() => !document.querySelector("#am-editor").open,
|
||||
);
|
||||
await page
|
||||
.locator(".am-linked-overview h4")
|
||||
.filter({ hasText: "New Monitor" })
|
||||
.waitFor();
|
||||
assert.equal(await page.locator('[data-monitor-create="1"]').count(), 0);
|
||||
await page.locator('[data-monitor-link="2"]').click();
|
||||
await page.waitForFunction(
|
||||
() => document.querySelectorAll(".am-linked-overview").length === 3,
|
||||
);
|
||||
await page.screenshot({ path: path.join(OUT, "asset-monitor-links.png") });
|
||||
await page.locator('[data-detail-tab="overview"]').click();
|
||||
await page.locator("[data-photo]").click();
|
||||
await page
|
||||
.locator("#am-photo-file")
|
||||
.setInputFiles({
|
||||
name: "test.png",
|
||||
mimeType: "image/png",
|
||||
buffer: photoPNG,
|
||||
});
|
||||
await page.locator('#am-photo-form [type="submit"]').click();
|
||||
await page.waitForFunction(() => !document.querySelector("#am-photo").open);
|
||||
await page.locator('.am-photo-grid img[alt="test.png"]').waitFor();
|
||||
await page.waitForFunction(
|
||||
() => document.querySelector(".am-photo-grid img")?.naturalWidth > 0,
|
||||
);
|
||||
await page.screenshot({ path: path.join(OUT, "asset-photos.png") });
|
||||
await page.keyboard.press("Escape");
|
||||
await page.setViewportSize({ width: 390, height: 844 });
|
||||
await page.locator("#am-reset").click();
|
||||
await page.waitForTimeout(100);
|
||||
@@ -517,9 +649,35 @@ const server = http.createServer(async (req, res) => {
|
||||
.setInputFiles(path.join(OUT, "asset_upload.xml"));
|
||||
await page.locator("#am-report-preview").waitFor({ state: "visible" });
|
||||
assert.equal(await page.locator("#am-import-save").isDisabled(), true);
|
||||
// 수퍼 관리자는 자산번호·사유 확인 후 삭제하고, 취소와 잘못된 입력은 요청하지 않습니다.
|
||||
await page.goto(origin + "/asset/?super=1&asset=asset5");
|
||||
await page.locator("[data-delete]").waitFor();
|
||||
await page.locator("[data-delete]").click();
|
||||
await page.locator("#am-delete-confirm").fill("WRONG");
|
||||
await page.locator("#am-delete-note").fill("Duplicate test asset");
|
||||
await page.locator('#am-delete-form [type="submit"]').click();
|
||||
await page
|
||||
.locator("#am-delete-form .am-form-error")
|
||||
.filter({ hasText: "자산번호" })
|
||||
.waitFor();
|
||||
const before = records.length;
|
||||
await page.locator("#am-delete-confirm").fill("AST-000006");
|
||||
await page.locator('#am-delete-form [type="submit"]').click();
|
||||
await page.waitForFunction(
|
||||
() => !document.querySelector("#am-detail").open,
|
||||
);
|
||||
assert.equal(records.length, before - 1);
|
||||
assert.equal(
|
||||
records.some((a) => a.id === "asset5"),
|
||||
false,
|
||||
);
|
||||
await page.waitForFunction(
|
||||
(n) => document.querySelector("#am-total").textContent === String(n),
|
||||
records.length,
|
||||
);
|
||||
assert.deepEqual(errors, []);
|
||||
console.log(
|
||||
"ALL PASS: Chrome desktop/mobile, search races, paging, specs, XSS escaping, conflict draft, create, checkout/checkin, report preview, setup mode",
|
||||
"ALL PASS: Chrome desktop/mobile, search races, paging, specs, XSS escaping, conflict draft, create, checkout/checkin, reports, setup mode, photos, monitor registration/link/overview, super-admin deletion",
|
||||
);
|
||||
} finally {
|
||||
await browser?.close();
|
||||
|
||||
@@ -21,8 +21,11 @@ for configured in (True, False):
|
||||
html = env.get_template("asset/index.html").render(
|
||||
user={"email": "reader@test.local", "name": "Reader"}, nav_items=[], is_admin=False,
|
||||
page_title="자산관리", page_subtitle="회사 자산을 한곳에서", categories=CATEGORIES, statuses=STATUSES,
|
||||
csrf_token="browser-test", configured=configured)
|
||||
csrf_token="browser-test", configured=configured, can_delete=False)
|
||||
(out / ("asset_render.html" if configured else "asset_unconfigured.html")).write_text(html, encoding="utf-8")
|
||||
(out / "asset_super.html").write_text(env.get_template("asset/index.html").render(
|
||||
user={"email":"super@test.local","name":"Super"},nav_items=[],is_admin=True,
|
||||
categories=CATEGORIES,statuses=STATUSES,csrf_token="browser-test",configured=True,can_delete=True),encoding="utf-8")
|
||||
sample = ROOT / "KING-DESKTOP.XML"
|
||||
raw = sample.read_bytes() if sample.exists() else report_xml()
|
||||
(out / "asset_report.json").write_text(json.dumps(parse_hwinfo(raw), ensure_ascii=False), encoding="utf-8")
|
||||
|
||||
Reference in New Issue
Block a user