feat: create program area form

containers/ecr-viewer/e2e/dual/admin-program.spec.ts

@@ -16,4 +16,41 @@ test.describe("program management page", () => {
     }).analyze();
     expect(accessibilityScanResultsBase.violations).toEqual([]);
   });
+
+  test("should create a program", async ({ page }) => {
+    await page.goto("/ecr-viewer/admin/program");
+
+    await expect(page.getByText("Program management")).toBeVisible();
+
+    await page.getByText("Create program area").click();
+
+    await page.waitForURL("/ecr-viewer/admin/program/create");
+    await expect(
+      page.getByRole("heading", { name: "Create program area" }),
+    ).toBeVisible();
+
+    const accessibilityScanResultsBase = await new AxeBuilder({
+      page,
+    }).analyze();
+    expect(accessibilityScanResultsBase.violations).toEqual([]);
+
+    // Find a random condition (avoid clashes in parallel tests)
+    const checkboxes = await page.getByRole("checkbox").all();
+    const index = Math.floor(Math.random() * checkboxes.length);
+    const checkbox = checkboxes[index];
+    const conditionName = await checkbox.inputValue();
+    await checkbox.scrollIntoViewIfNeeded();
+    await checkbox.dispatchEvent("click");
+
+    page.getByLabel("Program area name").fill(conditionName);
+
+    await page
+      .getByRole("button", { name: "Create program area" })
+      .first()
+      .click();
+
+    await page.waitForURL("/ecr-viewer/admin/program");
+    await expect(page.getByText("Program management")).toBeVisible();
+    await expect(page.getByText(conditionName)).toBeVisible();
+  });
 });

containers/ecr-viewer/integration/programAreaService.test.ts

@@ -110,7 +110,7 @@ describe("program area service", () => {
 
   it("should update a program area name", async () => {
     const progName = "Sad Times";
-    const id = await createProgramArea(progName, []);
+    const id = await createProgramArea(progName, ["123"]);
 
     const beforeNameConds = await listConditionReferences();
     await updateProgramArea(id, { name: "Happy Days" });
@@ -129,11 +129,12 @@ describe("program area service", () => {
 
   it("should update a program area conditions", async () => {
     const progName = "Sad Times";
-    const id = await createProgramArea(progName, []);
+    const id = await createProgramArea(progName, ["123"]);
 
     const beforeConds = await listConditionReferences();
     const beforeCond = beforeConds.filter((c) => c.program_area_uuid === id);
-    expect(beforeCond).toBeArrayOfSize(0);
+    expect(beforeCond).toBeArrayOfSize(1);
+    expect(beforeCond[0]).toHaveProperty("code", "123");
     await updateProgramArea(id, { conditions: ["789"] });
     const afterConds = await listConditionReferences();
     expect(beforeConds).not.toStrictEqual(afterConds);
@@ -144,7 +145,7 @@ describe("program area service", () => {
 
   it("should delete a program area", async () => {
     const beforeCreate = await listProgramAreas();
-    const id = await createProgramArea("test", []);
+    const id = await createProgramArea("test", ["123"]);
     const afterCreate = await listProgramAreas();
 
     await updateUserProgramAreas(adminId!, [id, progId!]);
@@ -155,7 +156,9 @@ describe("program area service", () => {
 
     const afterDelete = await listProgramAreas();
 
-    expect(beforeCreate).toStrictEqual(afterDelete);
+    expect(beforeCreate.map(({ uuid }) => uuid)).toStrictEqual(
+      afterDelete.map(({ uuid }) => uuid),
+    );
     expect(afterDelete).toBeArrayOfSize(3);
     expect(afterCreate).toBeArrayOfSize(4);
 

containers/ecr-viewer/integration/userService.test.ts

@@ -2,39 +2,64 @@
  * @jest-environment node
  */
 
+import { notFound } from "next/navigation";
+
+import { getDb } from "@/app/data/metadataDb/database";
+import { Core } from "@/app/data/metadataDb/types/core";
 import { createProgramArea } from "@/app/services/programAreaService";
 import {
   createInitialAdminUser,
   createUser,
   deleteUser,
+  getCheckAdmin,
   listUserProgramAreas,
   listUsers,
+  notFoundUnlessAdmin,
   updateUser,
   updateUserProgramAreas,
 } from "@/app/services/userService";
+import { getLoggedInUserSession } from "@/app/utils/auth-utils";
 
 import { buildCore, dropExisting } from "./helpers/ddl";
 
-beforeAll(async () => {
-  await buildCore();
-});
-
-afterAll(async () => {
-  await dropExisting();
-});
-
 const adminEmail = "[email protected]";
 const adminName = "Adam Admin";
 const userEmail = "[email protected]";
 
+const cond123 = {
+  code: "123",
+  concept_name: "condition 1 (disease)",
+  condition_name: "condition 1",
+  condition_category: "category",
+};
+
 const UUID_REGEX =
   /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 
-jest.mock("../src/app/utils/auth-utils", () => ({
-  getLoggedInUserSession: jest
-    .fn()
-    .mockResolvedValue({ name: "Adam Admin", email: "[email protected]" }),
-}));
+jest.mock("../src/app/utils/auth-utils");
+
+beforeAll(async () => {
+  await buildCore();
+  await getDb<Core>()
+    .insertInto("condition_reference")
+    .values(cond123)
+    .execute();
+});
+
+beforeEach(() => {
+  (getLoggedInUserSession as jest.Mock).mockResolvedValue({
+    name: "Adam Admin",
+    email: "[email protected]",
+  });
+});
+
+afterEach(() => {
+  jest.clearAllMocks();
+});
+
+afterAll(async () => {
+  await dropExisting();
+});
 
 describe("user service", () => {
   let adminId;
@@ -173,7 +198,7 @@ describe("user service", () => {
   it("should update a user's program areas", async () => {
     // standard user created in prior test
     await updateUser(userId!, { name: "Olga Nunes" });
-    const progId = await createProgramArea("Disease", []);
+    const progId = await createProgramArea("Disease", ["123"]);
 
     await updateUserProgramAreas(userId!, [progId]);
 
@@ -214,4 +239,35 @@ describe("user service", () => {
     const progAreas = await listUserProgramAreas(userId!);
     expect(progAreas).toStrictEqual([]);
   });
+
+  describe("getCheckAdmin", () => {
+    it("should return admin if user is an admin", async () => {
+      const admin = await getCheckAdmin("do a thing");
+      expect(admin.email).toBe(adminEmail);
+    });
+
+    it("should error if user is not an admin", async () => {
+      (getLoggedInUserSession as jest.Mock).mockResolvedValue({
+        name: "Sally Standard",
+        email: "[email protected]",
+      });
+      await expect(getCheckAdmin("do a thing")).rejects.toThrow();
+    });
+  });
+
+  describe("notFoundUnessAdmin", () => {
+    it("should do nothing if user is an admin", async () => {
+      await notFoundUnlessAdmin();
+      expect(notFound).not.toHaveBeenCalled();
+    });
+
+    it("should notFound if user is not an admin", async () => {
+      (getLoggedInUserSession as jest.Mock).mockResolvedValue({
+        name: "Sally Standard",
+        email: "[email protected]",
+      });
+      await notFoundUnlessAdmin();
+      expect(notFound).toHaveBeenCalled();
+    });
+  });
 });

containers/ecr-viewer/package.json

@@ -70,7 +70,7 @@
     "@next/eslint-plugin-next": "^14.2.5",
     "@playwright/test": "^1.51.1",
     "@smithy/util-stream": "^4.1.1",
-    "@testing-library/jest-dom": "^6.1.5",
+    "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
     "@types/fhir": "^0.0.41",

containers/ecr-viewer/src/app/admin/layout.tsx

@@ -0,0 +1,19 @@
+import { ReactNode } from "react";
+
+import Header from "@/app/components/Header";
+
+/**
+ * @param props React props
+ * @param props.children Page content
+ * @returns Basic elements present on all admin pages
+ */
+const AdminPageLayout = ({ children }: { children: ReactNode }) => {
+  return (
+    <div className="display-flex flex-column height-viewport">
+      <Header />
+      {children}
+    </div>
+  );
+};
+
+export default AdminPageLayout;