From e6f4bc9803153755806227a0ff46f043f2e14d98 Mon Sep 17 00:00:00 2001 From: Natalia Luzuriaga Date: Wed, 4 Sep 2024 13:28:24 -0700 Subject: [PATCH 01/13] added instructions to success page Signed-off-by: Natalia Luzuriaga --- frontend/css/style.css | 3 ++- frontend/pages/success.html | 11 ++++++++++- frontend/renderer/renderer-success.js | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/frontend/css/style.css b/frontend/css/style.css index 9c648fc..c7c9fe3 100644 --- a/frontend/css/style.css +++ b/frontend/css/style.css @@ -27,7 +27,8 @@ h2, width: 100%; } -.usa-alert { +.usa-alert, +#results-spreadsheet-instructions { display: none; } diff --git a/frontend/pages/success.html b/frontend/pages/success.html index 44c6413..6882dc1 100644 --- a/frontend/pages/success.html +++ b/frontend/pages/success.html @@ -38,6 +38,15 @@

Results

--> +
+

+ The results spreadsheet adds two new columns to each row in your patient records data: +

    +
  • unique_id: identifies a specific patient record
    • +
  • cluster_id: identifies a cluster of duplicates
    • +
+

+
+
+ Learn about DedupliFHIR
From c4878cb9a42b138e271c63dde7aeb2798d6562f7 Mon Sep 17 00:00:00 2001 From: Natalia Luzuriaga Date: Tue, 17 Sep 2024 12:11:23 -0700 Subject: [PATCH 10/13] Updated 5 frontend tests to match newly added ux updates Signed-off-by: Natalia Luzuriaga --- frontend/tests/frontend.spec.js | 38 +++++++++++++++++---------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/frontend/tests/frontend.spec.js b/frontend/tests/frontend.spec.js index 3c729a4..dfae79a 100644 --- a/frontend/tests/frontend.spec.js +++ b/frontend/tests/frontend.spec.js @@ -58,8 +58,8 @@ test("UI elements present", async () => { const content = await window.locator("div.content"); expect(content).not.toBeNull(); expect(content.locator("h1")).toHaveText("DedupliFHIR"); - await window.waitForSelector("h2"); - expect(content.locator("h2")).toHaveText("Upload Patient Records File"); + await window.waitForSelector("label"); + expect(content.locator("label")).toHaveText("To start deduplication, load your file into DedupliFHIR."); // Check for file dropper const fileDropper = await window.locator("input[type='file']"); @@ -79,18 +79,18 @@ test("UI elements present", async () => { expect(submitButton).toHaveId("submit"); }); -test("submit without uploading file", async () => { +test("submit without loading file", async () => { const submitButton = await window.locator("button[type='button']"); await submitButton.click(); const alert = await window.locator("#file-input-alert"); expect(alert).not.toBeNull(); expect(alert.locator("p")).toHaveText( - "File not found. Please upload a file.", + "File not found. Please load a file.", ); }); -test("upload file and submit", async () => { +test("load file and submit", async () => { // TODO: remove this when height bug is fixed await window.setViewportSize({ width: 1000, height: 3000 }); @@ -125,21 +125,21 @@ test("finished results present", async () => { expect(content.locator("h1")).toHaveText("DedupliFHIR"); // Wait for results - await window.waitForSelector("h2", { + await window.waitForSelector("p", { timeout: 1000 * 60 * 2, // two minutes }); - expect(content.locator("h2")).toHaveText("Results"); + expect(content.locator("p")).toHaveText("Your results are ready."); expect(content.locator("a[href='../index.html']")).not.toBeNull(); - expect(content.locator("#download")).not.toBeNull(); + expect(content.locator("#save-file")).not.toBeNull(); - expect(content.locator("#download-success-alert")).toBeHidden(); + expect(content.locator("#save-file-success-alert")).toBeHidden(); expect(content.locator("#results-spreadsheet-instructions")).toBeHidden(); - expect(content.locator("#download-fail-alert")).toBeHidden(); + expect(content.locator("#save-file-fail-alert")).toBeHidden(); }); -test("download file", async () => { - const downloadButton = await window.locator("#download"); - expect(downloadButton).not.toBeNull(); +test("save file", async () => { + const saveButton = await window.locator("#save-file"); + expect(saveButton).not.toBeNull(); // https://stackoverflow.com/a/75966734 const xlsxPath = path.join( @@ -151,18 +151,20 @@ test("download file", async () => { dialog.showSaveDialog = () => Promise.resolve({ filePath: xlsxPath, canceled: false }); }, xlsxPath); - await downloadButton.click(); + await saveButton.click(); - await window.waitForSelector("#download-success-alert"); - const successAlert = await window.locator("#download-success-alert"); + await window.waitForSelector("#save-file-success-alert"); + const successAlert = await window.locator("#save-file-success-alert"); expect(successAlert).not.toBeNull(); - expect(successAlert.locator("p")).toHaveText("Results file downloaded!"); + expect(successAlert.locator("p")).toHaveText("Results file saved to your computer."); const instructions = await window.locator( "#results-spreadsheet-instructions", ); expect(instructions).not.toBeNull(); + //TODO: check for home button and text + expect((await fs.promises.stat(xlsxPath)).size).toBeGreaterThan(100 * 1024); // file size should be > 100 KB }); @@ -178,5 +180,5 @@ test("return home", async () => { expect(content).not.toBeNull(); expect(content.locator("h1")).toHaveText("DedupliFHIR"); await window.waitForSelector("h2"); - expect(content.locator("h2")).toHaveText("Upload Patient Records File"); + expect(content.locator("h2")).toHaveText("Load Patient Records File"); }); From d824c75c7942e9b851b39f991e4b9654456012d6 Mon Sep 17 00:00:00 2001 From: Natalia Luzuriaga Date: Tue, 17 Sep 2024 17:44:40 -0700 Subject: [PATCH 11/13] Updated last 3 frontend test to reflect new ux updates Signed-off-by: Natalia Luzuriaga --- frontend/tests/frontend.spec.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/frontend/tests/frontend.spec.js b/frontend/tests/frontend.spec.js index dfae79a..8463b04 100644 --- a/frontend/tests/frontend.spec.js +++ b/frontend/tests/frontend.spec.js @@ -58,8 +58,8 @@ test("UI elements present", async () => { const content = await window.locator("div.content"); expect(content).not.toBeNull(); expect(content.locator("h1")).toHaveText("DedupliFHIR"); - await window.waitForSelector("label"); - expect(content.locator("label")).toHaveText("To start deduplication, load your file into DedupliFHIR."); + const instructionText = await window.locator("#file-input-copy"); + expect(instructionText).toHaveText("To start deduplication, load your file into DedupliFHIR."); // Check for file dropper const fileDropper = await window.locator("input[type='file']"); @@ -77,6 +77,10 @@ test("UI elements present", async () => { const submitButton = await window.locator("button[type='button']"); expect(submitButton).not.toBeNull(); expect(submitButton).toHaveId("submit"); + + // Check for security section + const securityText = await window.locator("#security-section"); + expect(securityText).not.toBeNull(); }); test("submit without loading file", async () => { @@ -91,9 +95,6 @@ test("submit without loading file", async () => { }); test("load file and submit", async () => { - // TODO: remove this when height bug is fixed - await window.setViewportSize({ width: 1000, height: 3000 }); - const fileDropper = await window.locator("input[type='file']"); await fileDropper.setInputFiles( @@ -128,7 +129,7 @@ test("finished results present", async () => { await window.waitForSelector("p", { timeout: 1000 * 60 * 2, // two minutes }); - expect(content.locator("p")).toHaveText("Your results are ready."); + expect(content.locator("#results-ready-text")).toHaveText("Your results are ready."); expect(content.locator("a[href='../index.html']")).not.toBeNull(); expect(content.locator("#save-file")).not.toBeNull(); @@ -163,7 +164,8 @@ test("save file", async () => { ); expect(instructions).not.toBeNull(); - //TODO: check for home button and text + const homeLink = await window.locator("a[href='../index.html']"); + expect(homeLink).not.toBeNull(); expect((await fs.promises.stat(xlsxPath)).size).toBeGreaterThan(100 * 1024); // file size should be > 100 KB }); @@ -179,6 +181,6 @@ test("return home", async () => { const content = await window.locator("div.content"); expect(content).not.toBeNull(); expect(content.locator("h1")).toHaveText("DedupliFHIR"); - await window.waitForSelector("h2"); - expect(content.locator("h2")).toHaveText("Load Patient Records File"); + const instructionText = await window.locator("#file-input-copy"); + expect(instructionText).toHaveText("To start deduplication, load your file into DedupliFHIR."); }); From 5f0ff177476fa5d2de91fc442504c2e5589ee570 Mon Sep 17 00:00:00 2001 From: Natalia Luzuriaga Date: Tue, 17 Sep 2024 17:46:14 -0700 Subject: [PATCH 12/13] Fix prettier warnings Signed-off-by: Natalia Luzuriaga --- frontend/tests/frontend.spec.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/frontend/tests/frontend.spec.js b/frontend/tests/frontend.spec.js index 8463b04..ce6234a 100644 --- a/frontend/tests/frontend.spec.js +++ b/frontend/tests/frontend.spec.js @@ -59,7 +59,9 @@ test("UI elements present", async () => { expect(content).not.toBeNull(); expect(content.locator("h1")).toHaveText("DedupliFHIR"); const instructionText = await window.locator("#file-input-copy"); - expect(instructionText).toHaveText("To start deduplication, load your file into DedupliFHIR."); + expect(instructionText).toHaveText( + "To start deduplication, load your file into DedupliFHIR.", + ); // Check for file dropper const fileDropper = await window.locator("input[type='file']"); @@ -89,9 +91,7 @@ test("submit without loading file", async () => { const alert = await window.locator("#file-input-alert"); expect(alert).not.toBeNull(); - expect(alert.locator("p")).toHaveText( - "File not found. Please load a file.", - ); + expect(alert.locator("p")).toHaveText("File not found. Please load a file."); }); test("load file and submit", async () => { @@ -129,7 +129,9 @@ test("finished results present", async () => { await window.waitForSelector("p", { timeout: 1000 * 60 * 2, // two minutes }); - expect(content.locator("#results-ready-text")).toHaveText("Your results are ready."); + expect(content.locator("#results-ready-text")).toHaveText( + "Your results are ready.", + ); expect(content.locator("a[href='../index.html']")).not.toBeNull(); expect(content.locator("#save-file")).not.toBeNull(); @@ -157,7 +159,9 @@ test("save file", async () => { await window.waitForSelector("#save-file-success-alert"); const successAlert = await window.locator("#save-file-success-alert"); expect(successAlert).not.toBeNull(); - expect(successAlert.locator("p")).toHaveText("Results file saved to your computer."); + expect(successAlert.locator("p")).toHaveText( + "Results file saved to your computer.", + ); const instructions = await window.locator( "#results-spreadsheet-instructions", @@ -182,5 +186,7 @@ test("return home", async () => { expect(content).not.toBeNull(); expect(content.locator("h1")).toHaveText("DedupliFHIR"); const instructionText = await window.locator("#file-input-copy"); - expect(instructionText).toHaveText("To start deduplication, load your file into DedupliFHIR."); + expect(instructionText).toHaveText( + "To start deduplication, load your file into DedupliFHIR.", + ); }); From 5b23cea85413af22b042612ad640029cf1ab47fe Mon Sep 17 00:00:00 2001 From: Natalia Luzuriaga Date: Tue, 17 Sep 2024 17:56:21 -0700 Subject: [PATCH 13/13] Updated error.html to reflect new UX changes. Signed-off-by: Natalia Luzuriaga --- frontend/pages/error.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/pages/error.html b/frontend/pages/error.html index a2be137..ef35073 100644 --- a/frontend/pages/error.html +++ b/frontend/pages/error.html @@ -11,7 +11,7 @@

DedupliFHIR

-

Results

+

Your results are ready.

- -
- Return to Home +

+ Back to home +