@thepalaceproject/circulation-admin 1.44.0 → 1.44.1-post.2

package/package.json

@@ -139,5 +139,5 @@
     "*.{js,jsx,ts,tsx,css,md}": "prettier --write",
     "*.{js,css,md}": "prettier --write"
   },
-  "version": "1.44.0"
+  "version": "1.44.1-post.2"
 }

package/tests/jest/components/Collections.test.tsx

@@ -156,8 +156,8 @@ describe("Collections - associated library disclosure", () => {
 
     const items = container.querySelectorAll(".associated-items li");
     // Sorted alphabetically: Alpha, Beta
-    expect(items[0].textContent).toBe("Alpha Library");
-    expect(items[1].textContent).toBe("Beta Library");
+    expect(items[0].textContent).toBe("Alpha Library - alpha");
+    expect(items[1].textContent).toBe("Beta Library - beta");
   });
 
   it("links a library name to its config page when a uuid is available", () => {
@@ -177,7 +177,7 @@ describe("Collections - associated library disclosure", () => {
       ".associated-items a"
     );
     expect(link).not.toBeNull();
-    expect(link.textContent).toBe("Alpha Library");
+    expect(link.textContent).toBe("Alpha Library - alpha");
     expect(link.href).toContain("/admin/web/config/libraries/edit/uuid-alpha");
   });
 
@@ -196,7 +196,7 @@ describe("Collections - associated library disclosure", () => {
 
     expect(container.querySelector(".associated-items a")).toBeNull();
     expect(container.querySelector(".associated-items li").textContent).toBe(
-      "Delta Library"
+      "Delta Library - delta"
     );
   });
 

package/tests/jest/components/DiscoveryServices.test.tsx

@@ -215,7 +215,9 @@ describe("DiscoveryServices - registered library disclosure", () => {
     fireEvent.click(container.querySelector(".association-toggle"));
 
     const item = container.querySelector(".associated-items li");
-    expect(item.textContent).toBe("Alpha Library - registered - production");
+    expect(item.textContent).toBe(
+      "Alpha Library - alpha - registered - production"
+    );
   });
 
   it("shows '- registered' without a stage when stage is absent", () => {
@@ -231,7 +233,7 @@ describe("DiscoveryServices - registered library disclosure", () => {
     fireEvent.click(container.querySelector(".association-toggle"));
 
     const item = container.querySelector(".associated-items li");
-    expect(item.textContent).toBe("Alpha Library - registered");
+    expect(item.textContent).toBe("Alpha Library - alpha - registered");
   });
 
   // ── Sorting ───────────────────────────────────────────────────────────────
@@ -290,7 +292,7 @@ describe("DiscoveryServices - registered library disclosure", () => {
       ".associated-items a"
     );
     expect(link).not.toBeNull();
-    expect(link.textContent).toBe("Alpha Library");
+    expect(link.textContent).toBe("Alpha Library - alpha");
     expect(link.href).toContain("/admin/web/config/libraries/edit/uuid-alpha");
     // The suffix should not be inside the link.
     expect(link.nextSibling.textContent).toBe(" - registered - production");
@@ -312,8 +314,36 @@ describe("DiscoveryServices - registered library disclosure", () => {
 
     expect(container.querySelector(".associated-items a")).toBeNull();
     expect(container.querySelector(".associated-items li").textContent).toBe(
-      "Delta Library - registered - testing"
+      "Delta Library - delta - registered - testing"
+    );
+  });
+
+  it("falls back to the registration record's own name and uuid for a library missing from allLibraries", () => {
+    const { container } = renderServices({
+      discovery_services: [{ id: 1, protocol: "p", name: "Service A" } as any],
+      libraryRegistrations: [
+        {
+          id: 1,
+          libraries: [
+            {
+              short_name: "omega",
+              name: "Omega Library",
+              uuid: "uuid-omega",
+              status: "success",
+              stage: "testing",
+            } as any,
+          ],
+        },
+      ],
+    });
+    fireEvent.click(container.querySelector(".association-toggle"));
+
+    const link = container.querySelector<HTMLAnchorElement>(
+      ".associated-items a"
     );
+    expect(link).not.toBeNull();
+    expect(link.textContent).toBe("Omega Library - omega");
+    expect(link.href).toContain("/admin/web/config/libraries/edit/uuid-omega");
   });
 
   // ── Per-service isolation ─────────────────────────────────────────────────

package/tests/jest/components/EditableConfigList.test.tsx

@@ -290,9 +290,9 @@ describe("EditableConfigList - library association disclosure", () => {
 
     const items = container.querySelectorAll(".associated-items li");
     expect(items).toHaveLength(3);
-    expect(items[0].textContent).toBe("Alpha Library");
-    expect(items[1].textContent).toBe("Beta Library");
-    expect(items[2].textContent).toBe("Gamma Library");
+    expect(items[0].textContent).toBe("Alpha Library - alpha");
+    expect(items[1].textContent).toBe("Beta Library - beta");
+    expect(items[2].textContent).toBe("Gamma Library - gamma");
   });
 
   it("renders a library with a uuid as a link to its config page", () => {
@@ -305,7 +305,7 @@ describe("EditableConfigList - library association disclosure", () => {
       ".associated-items a"
     );
     expect(link).not.toBeNull();
-    expect(link.textContent).toBe("Alpha Library");
+    expect(link.textContent).toBe("Alpha Library - alpha");
     expect(link.href).toContain("/admin/web/config/libraries/edit/uuid-alpha");
   });
 
@@ -317,7 +317,7 @@ describe("EditableConfigList - library association disclosure", () => {
 
     expect(container.querySelector(".associated-items a")).toBeNull();
     expect(container.querySelector(".associated-items li").textContent).toBe(
-      "Delta Library"
+      "Delta Library - delta"
     );
   });
 
@@ -373,8 +373,8 @@ describe("EditableConfigList - library association disclosure", () => {
       const items = container.querySelectorAll(".associated-items li");
       expect(items).toHaveLength(2);
       // Sorted alphabetically by resolved display name.
-      expect(items[0].textContent).toBe("Alpha Library");
-      expect(items[1].textContent).toBe("Beta Library");
+      expect(items[0].textContent).toBe("Alpha Library - alpha");
+      expect(items[1].textContent).toBe("Beta Library - beta");
     });
 
     it("falls back to short_name when allLibraries is absent from the data", () => {

package/tests/jest/components/IndividualAdminEditForm.test.tsx

@@ -246,6 +246,12 @@ describe("IndividualAdminEditForm - rendered inputs and role changes", () => {
     expect(email.readOnly).toBe(true);
   });
 
+  it("labels each library row in the role table with the name and short name", () => {
+    renderForm();
+    expect(screen.getByText("NYPL - nypl")).toBeInTheDocument();
+    expect(screen.getByText("BPL - bpl")).toBeInTheDocument();
+  });
+
   it("requires the email and password fields", () => {
     const { container } = renderForm();
     expect(container.querySelectorAll(".required-field")).toHaveLength(2);

package/tests/jest/components/IndividualAdmins.test.tsx

@@ -148,7 +148,7 @@ describe("IndividualAdmins - role association disclosure", () => {
 
     const items = container.querySelectorAll(".associated-items li");
     expect(items).toHaveLength(1);
-    expect(items[0].textContent).toBe("Alpha Library - Manager");
+    expect(items[0].textContent).toBe("Alpha Library - alpha - Manager");
   });
 
   it("shows '<library> - Librarian' for a librarian role", () => {
@@ -162,7 +162,7 @@ describe("IndividualAdmins - role association disclosure", () => {
 
     const items = container.querySelectorAll(".associated-items li");
     expect(items).toHaveLength(1);
-    expect(items[0].textContent).toBe("Beta Library - Librarian");
+    expect(items[0].textContent).toBe("Beta Library - beta - Librarian");
   });
 
   it("shows the highest role (Manager) when a library has both manager and librarian roles", () => {
@@ -179,7 +179,7 @@ describe("IndividualAdmins - role association disclosure", () => {
 
     const items = container.querySelectorAll(".associated-items li");
     expect(items).toHaveLength(1);
-    expect(items[0].textContent).toBe("Alpha Library - Manager");
+    expect(items[0].textContent).toBe("Alpha Library - alpha - Manager");
   });
 
   // ── Sitewide roles ────────────────────────────────────────────────────────
@@ -238,8 +238,8 @@ describe("IndividualAdmins - role association disclosure", () => {
     const items = container.querySelectorAll(".associated-items li");
     const texts = Array.from(items).map((li) => li.textContent);
     expect(texts).toContain("All libraries - Manager");
-    expect(texts).toContain("Alpha Library - Manager");
-    expect(texts).toContain("Beta Library - Librarian");
+    expect(texts).toContain("Alpha Library - alpha - Manager");
+    expect(texts).toContain("Beta Library - beta - Librarian");
   });
 
   it("shows both 'All libraries' and per-library entries when librarian-all and library roles coexist", () => {
@@ -257,7 +257,7 @@ describe("IndividualAdmins - role association disclosure", () => {
     const items = container.querySelectorAll(".associated-items li");
     const texts = Array.from(items).map((li) => li.textContent);
     expect(texts).toContain("All libraries - Librarian");
-    expect(texts).toContain("Gamma Library - Librarian");
+    expect(texts).toContain("Gamma Library - gamma - Librarian");
   });
 
   // ── Sorting ───────────────────────────────────────────────────────────────
@@ -276,9 +276,9 @@ describe("IndividualAdmins - role association disclosure", () => {
     fireEvent.click(container.querySelector(".association-toggle"));
 
     const items = container.querySelectorAll(".associated-items li");
-    expect(items[0].textContent).toBe("Alpha Library - Manager");
-    expect(items[1].textContent).toBe("Beta Library - Librarian");
-    expect(items[2].textContent).toBe("Gamma Library - Manager");
+    expect(items[0].textContent).toBe("Alpha Library - alpha - Manager");
+    expect(items[1].textContent).toBe("Beta Library - beta - Librarian");
+    expect(items[2].textContent).toBe("Gamma Library - gamma - Manager");
   });
 
   // ── Links ─────────────────────────────────────────────────────────────────
@@ -296,7 +296,7 @@ describe("IndividualAdmins - role association disclosure", () => {
       ".associated-items a"
     );
     expect(link).not.toBeNull();
-    expect(link.textContent).toBe("Alpha Library");
+    expect(link.textContent).toBe("Alpha Library - alpha");
     expect(link.href).toContain("/admin/web/config/libraries/edit/uuid-alpha");
     // The role suffix should not be part of the link.
     expect(link.nextSibling.textContent).toBe(" - Manager");
@@ -313,7 +313,22 @@ describe("IndividualAdmins - role association disclosure", () => {
 
     expect(container.querySelector(".associated-items a")).toBeNull();
     expect(container.querySelector(".associated-items li").textContent).toBe(
-      "Delta Library - Librarian"
+      "Delta Library - delta - Librarian"
+    );
+  });
+
+  it("shows just the short name, unlinked, for a role whose library is missing from allLibraries", () => {
+    const { container } = renderAdmins([
+      {
+        email: "mgr@example.com",
+        roles: [{ role: "manager", library: "omega" }],
+      },
+    ]);
+    fireEvent.click(container.querySelector(".association-toggle"));
+
+    expect(container.querySelector(".associated-items a")).toBeNull();
+    expect(container.querySelector(".associated-items li").textContent).toBe(
+      "omega - Manager"
     );
   });
 

package/tests/jest/components/Libraries.test.tsx

@@ -37,7 +37,7 @@ describe("Libraries - connected wiring", () => {
     // The library and its edit control appear once the on-mount fetch resolves
     // and mapStateToProps feeds the fetched data back in as props.
     expect(
-      await screen.findByText("New York Public Library")
+      await screen.findByText("New York Public Library - nypl")
     ).toBeInTheDocument();
     const editLink = await screen.findByRole("link", { name: /edit/i });
     expect(editLink).toHaveAttribute(
@@ -45,4 +45,23 @@ describe("Libraries - connected wiring", () => {
       "/admin/web/config/libraries/edit/uuid-nypl"
     );
   });
+
+  it("falls back to the uuid as the label for a library with no name and no short name", async () => {
+    jest.spyOn(globalThis, "fetch").mockImplementation(
+      async () =>
+        new Response(
+          JSON.stringify({
+            libraries: [{ uuid: "uuid-anon", settings: {} }],
+          }),
+          { status: 200, headers: { "Content-Type": "application/json" } }
+        )
+    );
+
+    renderWithProviders(<Libraries csrfToken="token" />, {
+      reduxProviderProps: { store: buildStore() },
+      appConfigSettings: { roles: [{ role: "system" }] },
+    });
+
+    expect(await screen.findByText("uuid-anon")).toBeInTheDocument();
+  });
 });

package/tests/jest/components/ServiceEditForm.test.tsx

@@ -417,6 +417,72 @@ describe("ServiceEditForm", () => {
       expect(libraries[0]).toHaveTextContent("New York Public Library");
     });
 
+    it("labels an associated library with its name and short name", () => {
+      const { container } = renderForm({ item: serviceData });
+      const editable = container.querySelectorAll(".with-edit-button");
+      expect(editable).toHaveLength(1);
+      expect(editable[0]).toHaveTextContent("New York Public Library - nypl");
+    });
+
+    it("links an associated library to its configuration page", () => {
+      const dataWithUuids = Object.assign({}, servicesData, {
+        allLibraries: [
+          Object.assign({}, allLibraries[0], { uuid: "nypl-uuid" }),
+          allLibraries[1],
+        ],
+      });
+      const { container } = renderForm({
+        data: dataWithUuids,
+        item: serviceData,
+      });
+      const link = container.querySelector(
+        ".with-edit-button a"
+      ) as HTMLAnchorElement;
+      expect(link).toBeInTheDocument();
+      expect(link).toHaveAttribute(
+        "href",
+        "/admin/web/config/libraries/edit/nypl-uuid"
+      );
+      expect(link).toHaveTextContent("New York Public Library - nypl");
+    });
+
+    it("opens the associated library link in a new tab, so unsaved edits survive a stray click", () => {
+      const dataWithUuids = Object.assign({}, servicesData, {
+        allLibraries: [
+          Object.assign({}, allLibraries[0], { uuid: "nypl-uuid" }),
+          allLibraries[1],
+        ],
+      });
+      const { container } = renderForm({
+        data: dataWithUuids,
+        item: serviceData,
+      });
+      const link = container.querySelector(
+        ".with-edit-button a"
+      ) as HTMLAnchorElement;
+      expect(link).toHaveAttribute("target", "_blank");
+      expect(link).toHaveAttribute("rel", "noopener noreferrer");
+      expect(link).toHaveAccessibleName(
+        "New York Public Library - nypl (opens in a new tab)"
+      );
+      // The visible new-tab cue for sighted users; hidden from screen readers,
+      // which get the aria-label wording instead.
+      const icon = link.querySelector("i.fa-external-link");
+      expect(icon).toBeInTheDocument();
+      expect(icon).toHaveAttribute("aria-hidden", "true");
+    });
+
+    it("falls back to the short name for a library missing from allLibraries", () => {
+      const serviceWithUnknownLibrary = Object.assign({}, serviceData, {
+        libraries: [{ short_name: "unknown" }],
+      });
+      const { container } = renderForm({ item: serviceWithUnknownLibrary });
+      const editable = container.querySelectorAll(".with-edit-button");
+      expect(editable).toHaveLength(1);
+      expect(editable[0]).toHaveTextContent("unknown");
+      expect(container.querySelector(".with-edit-button a")).toBeNull();
+    });
+
     it("renders removable and editable libraries", () => {
       const { container, unmount } = renderForm();
       expect(container.querySelectorAll(".with-remove-button")).toHaveLength(0);

package/tests/jest/components/ServiceWithRegistrationsEditForm.test.tsx

@@ -22,8 +22,9 @@ const protocolsData = [
   },
 ];
 const allLibraries = [
-  { short_name: "nypl", name: "New York Public Library" },
-  { short_name: "bpl", name: "Brooklyn Public Library" },
+  { short_name: "nypl", name: "New York Public Library", uuid: "uuid-nypl" },
+  { short_name: "bpl", name: "Brooklyn Public Library", uuid: "uuid-bpl" },
+  // No uuid, so this one has no configuration page to link to.
   { short_name: "qpl", name: "Queens Public Library" },
 ];
 const libraryRegistrationsData = [
@@ -75,15 +76,34 @@ describe("ServiceWithRegistrationsEditForm", () => {
       screen.getByRole("heading", { name: "Register libraries" })
     ).toBeInTheDocument();
 
+    // Each library is labeled "<name> - <short name>" and, when its uuid is
+    // known, links to its configuration page in a new tab.
+    const nyplLink = screen.getByRole("link", {
+      name: "New York Public Library - nypl (opens in a new tab)",
+    });
+    expect(nyplLink).toHaveAttribute(
+      "href",
+      "/admin/web/config/libraries/edit/uuid-nypl"
+    );
+    expect(nyplLink).toHaveAttribute("target", "_blank");
+    expect(nyplLink).toHaveAttribute("rel", "noopener noreferrer");
+
     expect(
-      screen.getByRole("link", { name: "New York Public Library" })
+      screen.getByRole("link", {
+        name: "Brooklyn Public Library - bpl (opens in a new tab)",
+      })
     ).toBeInTheDocument();
+
+    // Without a uuid there is no link, just the label. The same label also
+    // appears as an "Add Library" option, so scope to the registration list.
     expect(
-      screen.getByRole("link", { name: "Brooklyn Public Library" })
-    ).toBeInTheDocument();
+      screen
+        .getAllByText("Queens Public Library - qpl")
+        .some((element) => element.classList.contains("library-name"))
+    ).toBe(true);
     expect(
-      screen.getByRole("link", { name: "Queens Public Library" })
-    ).toBeInTheDocument();
+      screen.queryByRole("link", { name: /Queens Public Library/ })
+    ).toBeNull();
 
     // Statuses come from `data.libraryRegistrations`.
     expect(screen.getByText("Registered")).toHaveClass("bg-success");

package/tests/jest/utils/sharedFunctions.test.ts

@@ -2,6 +2,8 @@ import {
   findDefault,
   formatString,
   isEqual,
+  libraryConfigHref,
+  libraryLabel,
 } from "../../../src/utils/sharedFunctions";
 
 describe("findDefault", () => {
@@ -119,3 +121,33 @@ describe("isEqual", () => {
     expect(isEqual(["a", "a", "b"], ["b", "a", "a"])).toBe(true);
   });
 });
+
+describe("libraryLabel", () => {
+  it("combines the name and the short name", () => {
+    expect(libraryLabel("New York Public Library", "nypl")).toBe(
+      "New York Public Library - nypl"
+    );
+  });
+  it("falls back to the short name when there is no name", () => {
+    expect(libraryLabel(undefined, "nypl")).toBe("nypl");
+  });
+  it("falls back to the name when there is no short name", () => {
+    expect(libraryLabel("New York Public Library", undefined)).toBe(
+      "New York Public Library"
+    );
+  });
+  it("returns a placeholder when neither is available", () => {
+    expect(libraryLabel(undefined, undefined)).toBe("(unnamed)");
+  });
+});
+
+describe("libraryConfigHref", () => {
+  it("builds the library configuration url from a uuid", () => {
+    expect(libraryConfigHref("uuid-nypl")).toBe(
+      "/admin/web/config/libraries/edit/uuid-nypl"
+    );
+  });
+  it("returns undefined without a uuid", () => {
+    expect(libraryConfigHref(undefined)).toBeUndefined();
+  });
+});