@thepalaceproject/circulation-admin 1.6.0 → 1.7.1

package/package.json

@@ -20,6 +20,7 @@
     "test-js-list": "mocha --require lib/testHelper.js lib/__tests__/*.js lib/**/__tests__/*.js lib/**/**/__tests__/*.js --reporter ./testReporter.js",
     "test-ts": "npm run lint && mocha -r ts-node/register --require src/testHelper.ts src/__tests__/*.ts* src/**/__tests__/*.ts* src/**/**/__tests__/*.ts*",
     "test-file-ts": "npm run lint && mocha -r ts-node/register --require src/testHelper.ts",
+    "test-file-ts-nolint": "mocha -r ts-node/register --require src/testHelper.ts",
     "test": "npm run test-ts && npm run test-jest",
     "test-file": "npm run test-file-ts",
     "test-browser": "npm run test-chrome && npm run test-firefox",
@@ -57,7 +58,7 @@
     "react-dom": "^16.8.6",
     "react-redux": "^7.1.0",
     "react-router": "^3.2.0",
-    "recharts": "^1.0.1",
+    "recharts": "^1.8.6",
     "redux": "^4.0.1",
     "redux-thunk": "^2.3.0",
     "request": "^2.85.0",
@@ -76,6 +77,7 @@
     "@types/react": "^16.14.6",
     "@types/react-dom": "^16.9.8",
     "@types/react-redux": "^7.1.16",
+    "@types/redux-mock-store": "^1.0.3",
     "@typescript-eslint/eslint-plugin": "^5.46.0",
     "@typescript-eslint/parser": "^5.46.0",
     "chai": "4.2.0",
@@ -107,6 +109,7 @@
     "node-sass": "^8.0.0",
     "prettier": "2.1.2",
     "react-axe": "^3.3.0",
+    "redux-mock-store": "^1.5.4",
     "sass-lint": "^1.13.1",
     "sass-loader": "^13.2.0",
     "selenium-standalone": "^6.16.0",
@@ -136,5 +139,5 @@
     "*.{js,jsx,ts,tsx,css,md}": "prettier --write",
     "*.{js,css,md}": "prettier --write"
   },
-  "version": "1.6.0"
+  "version": "1.7.1"
 }

package/tests/__data__/statisticsApiResponseData.ts

@@ -0,0 +1,326 @@
+import { StatisticsData } from "../../src/interfaces";
+
+export const testLibraryKey = "lyrasis-reads";
+export const noCollectionsLibraryKey = "unfunded-library";
+export const noInventoryLibraryKey = "unfunded-library";
+export const noPatronsLibraryKey = "unused-library";
+export const statisticsApiResponseData: StatisticsData = {
+  collections: [
+    {
+      id: 7,
+      name: "TEST Palace Marketplace",
+      inventory: {
+        titles: 7753,
+        availableTitles: 7750,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 7753,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 7753,
+        meteredLicensesOwned: 305725,
+        meteredLicensesAvailable: 75337,
+      },
+    },
+    {
+      id: 8,
+      name: "TEST OverDrive",
+      inventory: {
+        titles: 4441,
+        availableTitles: 4436,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 4441,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 4441,
+        meteredLicensesOwned: 4072997338,
+        meteredLicensesAvailable: 4072997325,
+      },
+    },
+    {
+      id: 9,
+      name: "New Bibliotheca Test Collection",
+      inventory: {
+        titles: 76,
+        availableTitles: 64,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 76,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 76,
+        meteredLicensesOwned: 85,
+        meteredLicensesAvailable: 72,
+      },
+    },
+    {
+      id: 14,
+      name: "New BiblioBoard Test",
+      inventory: {
+        titles: 13306,
+        availableTitles: 13306,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 13306,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 13306,
+        meteredLicensesOwned: 13306,
+        meteredLicensesAvailable: 13306,
+      },
+    },
+    {
+      id: 16,
+      name: "TEST Baker & Taylor",
+      inventory: {
+        titles: 146,
+        availableTitles: 134,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 146,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 146,
+        meteredLicensesOwned: 147,
+        meteredLicensesAvailable: 135,
+      },
+    },
+    {
+      id: 17,
+      name: "A1QA Palace Marketplace",
+      inventory: {
+        titles: 7753,
+        availableTitles: 7750,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 7753,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 7753,
+        meteredLicensesOwned: 305730,
+        meteredLicensesAvailable: 75341,
+      },
+    },
+    {
+      id: 18,
+      name: "CALIFA Enki Test",
+      inventory: {
+        titles: 93239,
+        availableTitles: 91565,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 93239,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 93239,
+        meteredLicensesOwned: 7957965,
+        meteredLicensesAvailable: 7955952,
+      },
+    },
+    {
+      id: 19,
+      name: "Palace Bookshelf",
+      inventory: {
+        titles: 7838,
+        availableTitles: 7838,
+        selfHostedTitles: 0,
+        openAccessTitles: 7838,
+        licensedTitles: 0,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 0,
+        meteredLicensesOwned: 0,
+        meteredLicensesAvailable: 0,
+      },
+    },
+    {
+      id: 20,
+      name: "Test ProQuest OPDS 2",
+      inventory: {
+        titles: 1575,
+        availableTitles: 1575,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 1575,
+        unlimitedLicenseTitles: 1575,
+        meteredLicenseTitles: 0,
+        meteredLicensesOwned: 0,
+        meteredLicensesAvailable: 0,
+      },
+    },
+  ],
+  libraries: [
+    {
+      key: "lyrasis-reads",
+      name: "LYRASIS Reads",
+      patronStatistics: {
+        total: 132,
+        withActiveLoan: 21,
+        withActiveLoanOrHold: 23,
+        loans: 87,
+        holds: 5,
+      },
+      inventorySummary: {
+        titles: 29119,
+        availableTitles: 29092,
+        selfHostedTitles: 145,
+        openAccessTitles: 7838,
+        licensedTitles: 21281,
+        unlimitedLicenseTitles: 623,
+        meteredLicenseTitles: 20658,
+        meteredLicensesOwned: 319263,
+        meteredLicensesAvailable: 88850,
+      },
+      collectionIds: [7, 9, 14, 16, 19],
+    },
+    {
+      key: "announcements-test",
+      name: "Announcements Testing",
+      patronStatistics: {
+        total: 2,
+        withActiveLoan: 0,
+        withActiveLoanOrHold: 0,
+        loans: 0,
+        holds: 0,
+      },
+      inventorySummary: {
+        titles: 0,
+        availableTitles: 0,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 0,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 0,
+        meteredLicensesOwned: 0,
+        meteredLicensesAvailable: 0,
+      },
+      collectionIds: [],
+    },
+    {
+      key: "qa1223",
+      name: "Test Library for QA",
+      patronStatistics: {
+        total: 1,
+        withActiveLoan: 0,
+        withActiveLoanOrHold: 0,
+        loans: 0,
+        holds: 0,
+      },
+      inventorySummary: {
+        titles: 7753,
+        availableTitles: 7750,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 7753,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 7753,
+        meteredLicensesOwned: 305725,
+        meteredLicensesAvailable: 75337,
+      },
+      collectionIds: [7],
+    },
+    {
+      key: "od-test",
+      name: "Overdrive Integration Test",
+      patronStatistics: {
+        total: 3,
+        withActiveLoan: 0,
+        withActiveLoanOrHold: 0,
+        loans: 0,
+        holds: 0,
+      },
+      inventorySummary: {
+        titles: 4441,
+        availableTitles: 4436,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 4441,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 4441,
+        meteredLicensesOwned: 4072997338,
+        meteredLicensesAvailable: 4072997325,
+      },
+      collectionIds: [8],
+    },
+    {
+      key: "unused-library",
+      name: "The Unused Library",
+      patronStatistics: {
+        total: 0,
+        withActiveLoan: 0,
+        withActiveLoanOrHold: 0,
+        loans: 0,
+        holds: 0,
+      },
+      inventorySummary: {
+        titles: 33560,
+        availableTitles: 33528,
+        selfHostedTitles: 0,
+        openAccessTitles: 7838,
+        licensedTitles: 25722,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 25722,
+        meteredLicensesOwned: 4073316601,
+        meteredLicensesAvailable: 4073086175,
+      },
+      collectionIds: [7, 8, 9, 14, 16, 19],
+    },
+    {
+      key: "a1qa-test",
+      name: "A1QA Test Library",
+      patronStatistics: {
+        total: 7,
+        withActiveLoan: 0,
+        withActiveLoanOrHold: 0,
+        loans: 0,
+        holds: 0,
+      },
+      inventorySummary: {
+        titles: 107230,
+        availableTitles: 105524,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 107230,
+        unlimitedLicenseTitles: 1575,
+        meteredLicenseTitles: 105655,
+        meteredLicensesOwned: 4081261265,
+        meteredLicensesAvailable: 4081028825,
+      },
+      collectionIds: [8, 9, 16, 17, 18, 20],
+    },
+    {
+      key: "unfunded-library",
+      name: "The Unfunded Public Library",
+      patronStatistics: {
+        total: 0,
+        withActiveLoan: 0,
+        withActiveLoanOrHold: 0,
+        loans: 0,
+        holds: 0,
+      },
+      inventorySummary: {
+        titles: 0,
+        availableTitles: 0,
+        selfHostedTitles: 0,
+        openAccessTitles: 0,
+        licensedTitles: 0,
+        unlimitedLicenseTitles: 0,
+        meteredLicenseTitles: 0,
+        meteredLicensesOwned: 0,
+        meteredLicensesAvailable: 0,
+      },
+      collectionIds: [],
+    },
+  ],
+  inventorySummary: {
+    titles: 136127,
+    availableTitles: 134418,
+    selfHostedTitles: 0,
+    openAccessTitles: 7838,
+    licensedTitles: 128289,
+    unlimitedLicenseTitles: 1575,
+    meteredLicenseTitles: 126714,
+    meteredLicensesOwned: 4081580296,
+    meteredLicensesAvailable: 4081117468,
+  },
+  patronSummary: {
+    total: 145,
+    withActiveLoan: 0,
+    withActiveLoanOrHold: 4,
+    loans: 0,
+    holds: 5,
+  },
+};

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

@@ -1,6 +1,7 @@
 import * as React from "react";
-import { screen } from "@testing-library/react";
+import { screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
+
 import { rest } from "msw";
 import { setupServer } from "msw/node";
 import CustomLists from "../../../src/components/CustomLists";
@@ -105,4 +106,91 @@ describe("CustomLists", () => {
     items = screen.getAllByRole("treeitem");
     expect(items).toHaveLength(1);
   });
+
+  it("sends the language=all search parameter", async () => {
+    let searchParams = null;
+
+    server.use(
+      rest.get("*/search", (req, res, ctx) => {
+        searchParams = req.url.searchParams;
+
+        res(ctx.xml("<feed />"));
+      })
+    );
+
+    const user = userEvent.setup();
+
+    const contextProviderProps = {
+      csrfToken: "",
+      roles: [{ role: "system" }],
+    };
+
+    renderWithContext(
+      <CustomLists
+        csrfToken=""
+        editOrCreate="create"
+        library="testlib"
+        store={buildStore()}
+      />,
+      contextProviderProps
+    );
+
+    await user.click(screen.getByRole("textbox", { name: "filter value" }));
+    await user.keyboard("horror{enter}");
+
+    await waitFor(() => {
+      expect(searchParams.get("language")).toEqual("all");
+
+      expect(JSON.parse(searchParams.get("q"))).toEqual({
+        query: {
+          key: "genre",
+          value: "horror",
+        },
+      });
+    });
+  });
+
+  it("sends the language=all search parameter when a language filter is added, and places the language filter in the q parameter", async () => {
+    let searchParams = null;
+
+    server.use(
+      rest.get("*/search", (req, res, ctx) => {
+        searchParams = req.url.searchParams;
+
+        res(ctx.xml("<feed />"));
+      })
+    );
+
+    const user = userEvent.setup();
+
+    const contextProviderProps = {
+      csrfToken: "",
+      roles: [{ role: "system" }],
+    };
+
+    renderWithContext(
+      <CustomLists
+        csrfToken=""
+        editOrCreate="create"
+        library="testlib"
+        store={buildStore()}
+      />,
+      contextProviderProps
+    );
+
+    await user.click(screen.getByRole("radio", { name: "language" }));
+    await user.click(screen.getByRole("textbox", { name: "filter value" }));
+    await user.keyboard("french{enter}");
+
+    await waitFor(() => {
+      expect(searchParams.get("language")).toEqual("all");
+
+      expect(JSON.parse(searchParams.get("q"))).toEqual({
+        query: {
+          key: "language",
+          value: "french",
+        },
+      });
+    });
+  });
 });

package/webpack.dev-server.config.js

@@ -98,6 +98,29 @@ module.exports = (env) => {
     res.setHeader("location", locationUrl.href);
   };
 
+  /**
+   * Rewrites an OpenSearch description response. This changes back-end URLs in the description to
+   * point to the local server instead. This is a simple find-and-replace.
+   *
+   * @param responseBuffer A buffer containing the response body.
+   * @param req The request.
+   * @returns
+   */
+  const rewriteOpenSearch = (responseBuffer, req) => {
+    const requestHost = req.headers.host;
+
+    if (!requestHost) {
+      return responseBuffer;
+    }
+
+    const osd = responseBuffer.toString("utf8");
+
+    return osd.replace(
+      new RegExp(backendUrl.origin, "g"),
+      `http://${requestHost}`
+    );
+  };
+
   /**
    * Rewrites an OPDS response. This changes back-end URLs in the feed to point to the local server
    * instead. This is a simple find-and-replace.
@@ -162,6 +185,10 @@ module.exports = (env) => {
           return rewriteHTML(responseBuffer, req);
         }
 
+        if (contentType.startsWith("application/opensearchdescription+xml")) {
+          return rewriteOpenSearch(responseBuffer, req);
+        }
+
         return responseBuffer;
       }
     ),