@thepalaceproject/circulation-admin 1.45.0 → 1.46.0-post.2

package/package.json

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

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

@@ -364,4 +364,19 @@ describe("CustomListEditor", () => {
       container.querySelector(".sharing-info button")
     ).not.toBeInTheDocument();
   });
+
+  it("does not render a share button once the list is already shared, and shows the shared-state copy", () => {
+    const { container } = renderEditor({ isShared: true });
+
+    expect(
+      container.querySelector(".sharing-info button")
+    ).not.toBeInTheDocument();
+
+    expect(
+      screen.getByText(
+        "This list has been shared with other libraries, and will automatically be made available to any libraries registered in this Collection Manager, including libraries registered in the future.",
+        { exact: false }
+      )
+    ).toBeInTheDocument();
+  });
 });

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

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { render, screen, waitFor } from "@testing-library/react";
+import { render, screen, waitFor, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import * as fetchMock from "fetch-mock-jest";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
@@ -217,8 +217,11 @@ describe("PatronAuthServiceEditForm – serialization", () => {
 
     await user.click(saveButton);
 
-    // The library should now be collapsed (indicating editLibrary was called)
+    // Saving collapses the library. Reopening it shows the rule was stored in
+    // library state, not just read from the editor.
     expect(screen.queryByRole("button", { name: /Add Rule/i })).toBeNull();
+    await user.click(screen.getByRole("button", { name: /Edit/i }));
+    expect(screen.getByLabelText(/Rule Name/i)).toHaveValue("Test Rule");
   });
 
   it("includes patron_blocking_rules in payload when adding a new library", async () => {
@@ -253,8 +256,99 @@ describe("PatronAuthServiceEditForm – serialization", () => {
 
     await user.click(addButton);
 
-    // After adding, the library should appear in the list, editor no longer in "new library" form
+    // The new-library editor is gone. Opening the added library shows the rule
+    // was stored in library state.
     expect(screen.queryByLabelText(/Rule Name/i)).toBeNull();
+    await user.click(screen.getByRole("button", { name: /Edit/i }));
+    expect(screen.getByLabelText(/Rule Name/i)).toHaveValue("New Rule");
+  });
+});
+
+describe("PatronAuthServiceEditForm – per-library settings", () => {
+  const LIB_SETTING_KEY = "lib_setting";
+  const protocolWithLibrarySettings = {
+    ...SIP2_PROTOCOL_DATA,
+    library_settings: [{ key: LIB_SETTING_KEY, label: "Library setting" }],
+  };
+  const dataWithLibrarySettings: PatronAuthServicesData = {
+    ...servicesData,
+    protocols: [protocolWithLibrarySettings, OTHER_PROTOCOL_DATA],
+  };
+  const settingInput = (root: HTMLElement) =>
+    within(root).getByRole("textbox", {
+      name: /Library setting/i,
+    }) as HTMLInputElement;
+
+  it("keeps a library setting entered when adding a new library", async () => {
+    const user = userEvent.setup();
+    const item = {
+      id: 3,
+      protocol: SIP2_PROTOCOL,
+      settings: {},
+      libraries: [],
+    };
+    const { container } = renderForm(
+      <PatronAuthServiceEditForm
+        {...baseProps}
+        data={dataWithLibrarySettings}
+        item={item}
+      />
+    );
+
+    await expandLibrariesPanel(user);
+    await user.selectOptions(
+      screen.getByRole("combobox", { name: /Add Library/i }),
+      LIBRARY_SHORT_NAME
+    );
+    await user.type(settingInput(container), "added value");
+    await user.click(screen.getByRole("button", { name: /Add Library/i }));
+
+    // Reopen the new library's settings; the value entered on add is there.
+    await user.click(screen.getByRole("button", { name: /Edit/i }));
+    const editSection = container.querySelector(
+      ".edit-library-settings"
+    ) as HTMLElement;
+    expect(settingInput(editSection).value).toBe("added value");
+  });
+
+  it("keeps a library setting changed when editing an existing library", async () => {
+    const user = userEvent.setup();
+    const item = {
+      ...buildSIP2Item(),
+      libraries: [
+        { short_name: LIBRARY_SHORT_NAME, [LIB_SETTING_KEY]: "old value" },
+      ],
+    };
+    const { container } = renderForm(
+      <PatronAuthServiceEditForm
+        {...baseProps}
+        data={dataWithLibrarySettings}
+        item={item}
+      />
+    );
+
+    await expandLibrariesPanel(user);
+    const clickEdit = () =>
+      user.click(screen.getByRole("button", { name: /Edit/i }));
+    await clickEdit();
+    let editSection = container.querySelector(
+      ".edit-library-settings"
+    ) as HTMLElement;
+    expect(settingInput(editSection).value).toBe("old value");
+
+    await user.clear(settingInput(editSection));
+    await user.type(settingInput(editSection), "new value");
+    await user.click(
+      editSection.querySelector("button.edit-library") as HTMLElement
+    );
+
+    // Saving collapses the library; reopening shows the saved value.
+    expect(container.querySelector(".edit-library-settings")).toBeNull();
+    await clickEdit();
+    editSection = container.querySelector(
+      ".edit-library-settings"
+    ) as HTMLElement;
+    expect(settingInput(editSection).value).toBe("new value");
   });
 });
 

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

@@ -4,6 +4,7 @@ import { render, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 
 import ServiceEditForm, {
+  libraryRefKey,
   ServiceEditFormProps,
   ServiceEditFormState,
 } from "../../../src/components/ServiceEditForm";
@@ -896,6 +897,27 @@ describe("ServiceEditForm", () => {
       expect(libraries).toHaveLength(0);
     });
 
+    it("removes an expanded library and closes its settings", async () => {
+      const user = userEvent.setup();
+      const { container } = renderForm({ item: serviceData });
+      const libraryItem = container.querySelector(
+        ".with-remove-button"
+      ) as HTMLElement;
+
+      await user.click(
+        libraryItem.querySelector("button.edit-btn") as HTMLElement
+      );
+      expect(
+        container.querySelector(".edit-library-settings")
+      ).toBeInTheDocument();
+
+      await user.click(
+        libraryItem.querySelector("button.remove-btn") as HTMLElement
+      );
+      expect(container.querySelectorAll(".with-remove-button")).toHaveLength(0);
+      expect(container.querySelector(".edit-library-settings")).toBeNull();
+    });
+
     it("edits a library", async () => {
       const user = userEvent.setup();
       const { container } = renderForm({ item: serviceData });
@@ -978,6 +1000,15 @@ describe("ServiceEditForm", () => {
       ).toBe("option3");
     });
 
+    it("builds library ref keys for add and edit mode", () => {
+      expect(libraryRefKey("key", "add")).toBe("key");
+      expect(libraryRefKey("key", "edit", "nypl")).toBe("nypl_key");
+      // Compile-time guard: ts-jest fails this file if the overloads stop
+      // rejecting an edit-mode call with no short name.
+      // @ts-expect-error edit mode must pass the library short name
+      libraryRefKey("key", "edit");
+    });
+
     it("calls save when the form is submitted", async () => {
       // The reusable Form wires submission solely through its submit button's
       // onClick, so clicking it is the only way to submit; assert the resulting
@@ -1059,6 +1090,28 @@ describe("ServiceEditForm", () => {
       expect(nameInput().value).toBe("");
     });
 
+    it("clears every associated library after a successful save (PP-5153)", () => {
+      const threeLibraries = {
+        ...serviceData,
+        libraries: [
+          { short_name: "nypl" },
+          { short_name: "bpl" },
+          { short_name: "qpl" },
+        ],
+      };
+      const { container, rerender } = renderForm({ item: threeLibraries });
+      expect(container.querySelectorAll(".with-remove-button")).toHaveLength(3);
+
+      // clearForm fires onRemove once per library inside one React batch.
+      // Each removal must build on the previous one, otherwise only the last
+      // one survives and the other libraries stay in the list.
+      rerenderForm(rerender, {
+        item: threeLibraries,
+        responseBody: "new service",
+      });
+      expect(container.querySelectorAll(".with-remove-button")).toHaveLength(0);
+    });
+
     it("doesn't clear the form if there's an error message", async () => {
       const user = userEvent.setup();
       const { container, rerender } = renderForm();