@thepalaceproject/circulation-admin 1.41.0-post.33 → 1.41.0-post.34

package/eslint.config.mjs

@@ -14,6 +14,15 @@ export default tseslint.config(
   ...tseslint.configs.recommended,
   react.configs.flat.recommended,
   jsxA11y.flatConfigs.strict,
+  {
+    // Global so react rules can detect the version everywhere they run,
+    // including config files outside the files filter below.
+    settings: {
+      react: {
+        version: "detect",
+      },
+    },
+  },
   {
     files: ["**/*.{js,jsx,ts,tsx}"],
     plugins: {
@@ -28,11 +37,6 @@ export default tseslint.config(
         ...globals.jest,
       },
     },
-    settings: {
-      react: {
-        version: "detect",
-      },
-    },
     rules: {
       // Enable the two classic react-hooks rules explicitly rather than
       // spreading `reactHooks.configs.recommended.rules`. eslint-plugin-react-hooks
@@ -78,18 +82,6 @@ export default tseslint.config(
     },
   },
   // Disable ESLint formatting rules that conflict with Prettier.
-  // This should be nearly the last option so it overrides previous rules.
-  prettier,
-  {
-    // ESLint merges `linterOptions` with last-writer-wins
-    // semantics, so placing it after every preset spread keeps a future plugin
-    // config from silently re-enabling it. Flat config reports unused
-    // eslint-disable directives by default; the previous .eslintrc setup did
-    // not. Keep it off to preserve prior behavior and avoid the pre-commit hook
-    // auto-stripping existing directives. Cleaning up stale directives can be
-    // done as a separate, focused change.
-    linterOptions: {
-      reportUnusedDisableDirectives: "off",
-    },
-  }
+  // This should be the last option so it overrides previous rules.
+  prettier
 );

package/jest.polyfills.js

@@ -2,7 +2,6 @@
 
 const globalThis = window;
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 const { fetch, Headers, Request, Response } = require("fetch-ponyfill")();
 Object.defineProperties(globalThis, {
   fetch: { value: fetch, writable: true },

package/package.json

@@ -15,6 +15,7 @@
   "scripts": {
     "prepublish": "npm run prod",
     "lint": "tslint -c tslint.json src/*.ts src/*.tsx src/**/*.ts src/**/*.tsx src/**/**/*.ts src/**/**/*.tsx && sass-lint -c .sass-lint.yml -v -q",
+    "lint:js": "eslint . --max-warnings 0",
     "test-js": "npm run lint && tsc && cp -r src/stylesheets lib && cp -r src/images lib && mocha --require lib/testHelper.js lib/__tests__/*.js lib/**/__tests__/*.js lib/**/**/__tests__/*.js",
     "test-js-file": "npm run lint && tsc && cp -r src/stylesheets lib && cp -r src/images lib && mocha --require lib/testHelper.js",
     "test-js-list": "mocha --require lib/testHelper.js lib/__tests__/*.js lib/**/__tests__/*.js lib/**/**/__tests__/*.js --reporter ./testReporter.js",
@@ -154,5 +155,5 @@
     "*.{js,jsx,ts,tsx,css,md}": "prettier --write",
     "*.{js,css,md}": "prettier --write"
   },
-  "version": "1.41.0-post.33"
+  "version": "1.41.0-post.34"
 }

package/scripts/syncPatronBlockingDocs.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-/* eslint-disable @typescript-eslint/no-var-requires */
 /**
  * Reads ../circulation/docs/FUNCTIONS.md, converts it to HTML, and writes
  * src/content/patronBlockingFunctionsHtml.ts — a TypeScript module that

package/testReporter.js

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-
 const mocha = require("mocha");
 const sinon = require("sinon");
 const color = require("colors-cli/safe");

package/tests/browser/navigate.js

@@ -1,4 +1,3 @@
-const breadcrumbSelector = "ol.breadcrumb";
 let loadingSelector;
 let catalogPage;
 let bookPage;
@@ -21,68 +20,62 @@ module.exports = {
       });
   },
 
-  "navigate to the first lane and back": function(browser) {
+  "navigate to the first lane and back": function (browser) {
     const { laneSelector } = catalogPage.elements;
     const { nthBreadcrumbSelector } = catalogPage;
 
-    browser
-      .goHome()
-      .url(function(result) {
-        let catalogUrl = result.value;
-        this.getAttribute(laneSelector, "href", function(result) {
-          let laneUrl = result.value;
-          this.getText(laneSelector, function(laneText) {
-            let laneTitle = laneText.value;
+    browser.goHome().url(function (result) {
+      let catalogUrl = result.value;
+      this.getAttribute(laneSelector, "href", function (result) {
+        let laneUrl = result.value;
+        this.getText(laneSelector, function (laneText) {
+          let laneTitle = laneText.value;
 
-            this.click(laneSelector)
-              .waitForElementNotPresent(loadingSelector, 5000)
-              .verify.noError()
-              .verify.urlEquals(laneUrl)
-              .verify.titleContains(laneTitle)
-              // when a lane selector is clicked, we go into another
-              // navigation level
-              .verify.elementPresent(nthBreadcrumbSelector(3))
-              .back()
-              .waitForElementNotPresent(loadingSelector, 5000)
-              .verify.urlEquals(catalogUrl)
-              .verify.elementNotPresent(nthBreadcrumbSelector(3));
-          });
+          this.click(laneSelector)
+            .waitForElementNotPresent(loadingSelector, 5000)
+            .verify.noError()
+            .verify.urlEquals(laneUrl)
+            .verify.titleContains(laneTitle)
+            // when a lane selector is clicked, we go into another
+            // navigation level
+            .verify.elementPresent(nthBreadcrumbSelector(3))
+            .back()
+            .waitForElementNotPresent(loadingSelector, 5000)
+            .verify.urlEquals(catalogUrl)
+            .verify.elementNotPresent(nthBreadcrumbSelector(3));
         });
       });
+    });
   },
 
-  "navigate to the first book in the first lane and back": function(browser) {
-    const {
-      bookSelector,
-      bookLinkTitleSelector
-    } = catalogPage.elements;
+  "navigate to the first book in the first lane and back": function (browser) {
+    const { bookSelector, bookLinkTitleSelector } = catalogPage.elements;
     const { bookTitleSelector } = bookPage.elements;
 
-    browser
-      .goHome()
-      .url(function(result) {
-        let catalogUrl = result.value;
-        this.getAttribute(bookSelector, "href", function(result) {
-          let bookUrl = result.value;
-          this.getText(bookLinkTitleSelector, function(result) {
-            let bookTitle = result.value;
-            this
-              .click(bookSelector)
-              .waitForElementPresent(bookTitleSelector, 5000)
-              .verify.noError()
-              .verify.urlEquals(bookUrl)
-              .verify.titleContains(bookTitle)
-              .verify.containsText(bookTitleSelector, bookTitle)
-              .back()
-              .waitForElementNotPresent(loadingSelector, 5000)
-              .verify.urlEquals(catalogUrl)
-              .verify.elementNotPresent(bookTitleSelector);
-          });
+    browser.goHome().url(function (result) {
+      let catalogUrl = result.value;
+      this.getAttribute(bookSelector, "href", function (result) {
+        let bookUrl = result.value;
+        this.getText(bookLinkTitleSelector, function (result) {
+          let bookTitle = result.value;
+          this.click(bookSelector)
+            .waitForElementPresent(bookTitleSelector, 5000)
+            .verify.noError()
+            .verify.urlEquals(bookUrl)
+            .verify.titleContains(bookTitle)
+            .verify.containsText(bookTitleSelector, bookTitle)
+            .back()
+            .waitForElementNotPresent(loadingSelector, 5000)
+            .verify.urlEquals(catalogUrl)
+            .verify.elementNotPresent(bookTitleSelector);
         });
       });
+    });
   },
 
-  "navigate to the first book, click through tabs, refresh page, go back": function(browser) {
+  "navigate to the first book, click through tabs, refresh page, go back": function (
+    browser
+  ) {
     const { bookSelector } = catalogPage.elements;
     const {
       bookTitleSelector,
@@ -95,87 +88,84 @@ module.exports = {
       classificationsTabSelector,
       coverTabSelector,
       complaintsTabSelector,
-      listsTabSelector
+      listsTabSelector,
     } = bookPage.elements;
 
-    browser
-      .goHome()
-      .getAttribute(bookSelector, "href", function(result) {
-        let bookUrl = result.value;
-        this.getAttribute(bookSelector, "title", function(result) {
-          let bookTitle = result.value;
-          this
-            .click(bookSelector)
-            .waitForElementPresent(bookTitleSelector, 5000)
-            .verify.noError()
-            .verify.urlEquals(bookUrl)
-            .verify.containsText(bookTitleSelector, bookTitle)
+    browser.goHome().getAttribute(bookSelector, "href", function (result) {
+      let bookUrl = result.value;
+      this.getAttribute(bookSelector, "title", function (result) {
+        let bookTitle = result.value;
+        this.click(bookSelector)
+          .waitForElementPresent(bookTitleSelector, 5000)
+          .verify.noError()
+          .verify.urlEquals(bookUrl)
+          .verify.containsText(bookTitleSelector, bookTitle)
 
-            // go to the edit tab
-            .click(editTabSelector)
-            .waitForElementPresent(titleInputSelector, 5000)
-            .verify.urlContains("tab/edit")
-            .verify.value(titleInputSelector, bookTitle)
+          // go to the edit tab
+          .click(editTabSelector)
+          .waitForElementPresent(titleInputSelector, 5000)
+          .verify.urlContains("tab/edit")
+          .verify.value(titleInputSelector, bookTitle)
 
-            // go to the classifications tab
-            .click(classificationsTabSelector)
-            .waitForElementPresent(genreInputSelector, 5000)
-            .verify.urlContains("tab/classifications")
+          // go to the classifications tab
+          .click(classificationsTabSelector)
+          .waitForElementPresent(genreInputSelector, 5000)
+          .verify.urlContains("tab/classifications")
 
-            // go to the image cover tab
-            .click(coverTabSelector)
-            .waitForElementPresent(coverInputSelector, 5000)
-            .verify.urlContains("tab/cover")
+          // go to the image cover tab
+          .click(coverTabSelector)
+          .waitForElementPresent(coverInputSelector, 5000)
+          .verify.urlContains("tab/cover")
 
-            // go to the complaints tab
-            .click(complaintsTabSelector)
-            .waitForElementPresent(complaintInputSelector, 5000)
-            .verify.urlContains("tab/complaints")
-            .refresh()
-            .waitForElementPresent(complaintInputSelector, 5000)
-            .verify.urlContains("tab/complaints")
-            .verify.titleContains(bookTitle)
+          // go to the complaints tab
+          .click(complaintsTabSelector)
+          .waitForElementPresent(complaintInputSelector, 5000)
+          .verify.urlContains("tab/complaints")
+          .refresh()
+          .waitForElementPresent(complaintInputSelector, 5000)
+          .verify.urlContains("tab/complaints")
+          .verify.titleContains(bookTitle)
 
-            // go to the list tab
-            .click(listsTabSelector)
-            .waitForElementPresent(listInputSelector, 5000)
-            .verify.urlContains("tab/list")
+          // go to the list tab
+          .click(listsTabSelector)
+          .waitForElementPresent(listInputSelector, 5000)
+          .verify.urlContains("tab/list")
 
-            // go back to the complaints tab
-            .back()
-            // go back to the cover tab
-            .back()
-            // go back to the classifications tab
-            .back()
-            // go back to the edit tab
-            .back()
-            // go back to the main details tab
-            .back()
-            .waitForElementPresent(bookTitleSelector, 5000)
-            .verify.urlEquals(bookUrl);
-        });
+          // go back to the complaints tab
+          .back()
+          // go back to the cover tab
+          .back()
+          // go back to the classifications tab
+          .back()
+          // go back to the edit tab
+          .back()
+          // go back to the main details tab
+          .back()
+          .waitForElementPresent(bookTitleSelector, 5000)
+          .verify.urlEquals(bookUrl);
       });
+    });
   },
 
-  "navigate to top-level feeds": function(browser) {
+  "navigate to top-level feeds": function (browser) {
     const {
       laneSelector,
       complaintsSelector,
-      hiddenSelector
+      hiddenSelector,
     } = catalogPage.elements;
     const { nthBreadcrumbSelector } = catalogPage;
 
     browser
       .goHome()
-      .getAttribute(complaintsSelector, "href", function(result) {
+      .getAttribute(complaintsSelector, "href", function (result) {
         let complaintsUrl = result.value;
-        this.getText(complaintsSelector, function(result) {
+        this.getText(complaintsSelector, function (result) {
           let complaintsTitle = result.value;
-          this.getAttribute(hiddenSelector, "href", function(result) {
-            let hiddenUrl = result.value
-            this.getText(hiddenSelector, function(result) {
+          this.getAttribute(hiddenSelector, "href", function (result) {
+            let hiddenUrl = result.value;
+            this.getText(hiddenSelector, function (result) {
               let hiddenTitle = result.value;
-              this.getText(laneSelector, function(result) {
+              this.getText(laneSelector, function (result) {
                 let laneTitle = result.value;
                 this
                   // go to the first lane
@@ -192,7 +182,10 @@ module.exports = {
                   .waitForElementNotPresent(loadingSelector, 5000)
                   .assert.noError()
                   .assert.containsText(nthBreadcrumbSelector(1), "All Books")
-                  .assert.containsText(nthBreadcrumbSelector(2), complaintsTitle)
+                  .assert.containsText(
+                    nthBreadcrumbSelector(2),
+                    complaintsTitle
+                  )
                   .verify.urlEquals(complaintsUrl)
 
                   // go to the hidden books page
@@ -209,7 +202,7 @@ module.exports = {
       });
   },
 
-  "navigate to dashboard and back to catalog": function(browser) {
+  "navigate to dashboard and back to catalog": function (browser) {
     const {
       catalogSelector,
       dashboardSelector,
@@ -220,12 +213,11 @@ module.exports = {
 
     browser
       .goHome()
-      .getAttribute(nthBreadcrumbSelector(1), "title", function(result) {
+      .getAttribute(nthBreadcrumbSelector(1), "title", function (result) {
         let libraryName = result.value;
-        this.getAttribute(catalogSelector, "href", function(result) {
+        this.getAttribute(catalogSelector, "href", function (result) {
           let catalogUrl = result.value;
-            this.getAttribute(dashboardSelector, "href", function(result) {
-            let dashboardUrl = result.value
+          this.getAttribute(dashboardSelector, "href", function () {
             this
               // go to the dashboard
               .click(dashboardSelector)
@@ -241,18 +233,16 @@ module.exports = {
               .assert.noError()
               .verify.elementPresent(nthBreadcrumbSelector(1))
               .verify.urlEquals(catalogUrl)
-              .verify.titleContains(`Palace Collection Manager - ${libraryName}`);
+              .verify.titleContains(
+                `Palace Collection Manager - ${libraryName}`
+              );
           });
         });
       });
   },
 
-  "navigate to two different book detail pages": function(browser) {
-    const {
-      laneSelector,
-      firstBookSelector,
-      secondBookSelector
-    } = catalogPage.elements;
+  "navigate to two different book detail pages": function (browser) {
+    const { firstBookSelector, secondBookSelector } = catalogPage.elements;
     const { bookTitleSelector } = bookPage.elements;
     const { nthBreadcrumbSelector } = catalogPage;
 
@@ -263,7 +253,7 @@ module.exports = {
       .click(firstBookSelector)
       .waitForElementNotPresent(loadingSelector, 5000)
       .waitForElementPresent(bookTitleSelector, 5000)
-      .getText(bookTitleSelector, function(result) {
+      .getText(bookTitleSelector, function (result) {
         let firstTitle = result.value;
 
         this
@@ -278,7 +268,7 @@ module.exports = {
           .waitForElementPresent(bookTitleSelector, 50000)
 
           // making sure that we are on a new book
-          .getText(bookTitleSelector, function(result) {
+          .getText(bookTitleSelector, function (result) {
             let secondTitle = result.value;
             this.assert.notEqual(firstTitle, secondTitle);
           });
@@ -290,5 +280,5 @@ module.exports = {
    */
   after: (browser) => {
     browser.end();
-  }
+  },
 };

package/tests/browser/redirect.js

@@ -1,44 +1,30 @@
-const http = require('follow-redirects').http
+const http = require("follow-redirects").http;
 
-const fetchGroupPage = (browser) => {
+const fetchGroupPage = () => {
   return new Promise((resolve, reject) => {
-    http.get({
-      host: "localhost",
-      port: 6500,
-      path: "/groups/"
-    }, (response) => {
-      let body = "";
+    http.get(
+      {
+        host: "localhost",
+        port: 6500,
+        path: "/groups/",
+      },
+      (response) => {
+        let body = "";
 
-      response.on("data", (chunk) => {
-        body += chunk;
-      });
+        response.on("data", (chunk) => {
+          body += chunk;
+        });
 
-      response.on("error", (err) => {
-        reject(err);
-      });
+        response.on("error", (err) => {
+          reject(err);
+        });
 
-      response.on("end", () => {
-        resolve(body);
-      });
-    });
-  });
-}
-const getAdminBookUrlAndTitle = (body, browser) => {
-  const bookTitle = body.match(/<entry [\s\S]+?<title>([^<]+)<\/title>/i)[1];
-  const link = body.match(/<link [^>]*rel="alternate[^>]+\/>/i)[0];
-  const id = body.match(/<id>[\s\S]+?<\/id>/i)[0];
-  const lib = id.match(/\/[\w]+/i)[0]; // includes forward slash
-  const bookUrl = link.match(/href="([^"]+)"/)[1];
-  const entryBaseUrl = browser.globals.homeUrl.replace("/admin/web/", lib + "/works");
-
-  // transform the book url into an admin book url
-  const adminBookUrl =
-    browser.globals.homeUrl + "collection" + lib + "/book" + lib +
-    encodeURIComponent(
-      bookUrl.replace(entryBaseUrl, "")
+        response.on("end", () => {
+          resolve(body);
+        });
+      }
     );
-
-  return { adminBookUrl, bookTitle };
+  });
 };
 const getAdminListUrl = (body, browser) => {
   const listBaseUrl = `${browser.globals.homeUrl}lists`;
@@ -56,11 +42,10 @@ module.exports = {
     loginPage = browser.page.login();
     loadingSelector = browser.page.catalog().elements.loadingSelector;
 
-    fetchGroupPage(browser)
-      .then(data => {
-        body = data
-        done();
-      });
+    fetchGroupPage(browser).then((data) => {
+      body = data;
+      done();
+    });
   },
 
   "attempt to view the admin list page before signing in": (browser) => {
@@ -100,5 +85,5 @@ module.exports = {
 
   afterEach: (browser) => {
     browser.end();
-  }
+  },
 };

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

@@ -5,7 +5,7 @@ import AdvancedSearchBuilder from "../../../src/components/AdvancedSearchBuilder
 
 describe("AdvancedSearchBuilder", () => {
   it("renders a placeholder and help text when the publication date filter is selected", async () => {
-    const user = userEvent.setup();
+    userEvent.setup();
 
     const query = {
       id: "0",

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

@@ -11,7 +11,6 @@ import { ConfigurationSettings } from "../../../src/interfaces";
 describe("CustomLists", () => {
   // Stub scrollTo, since a component in the render tree will try to call it, and it is not
   // provided by JSDOM.
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   Element.prototype.scrollTo = () => {};
 
   const server = setupServer(

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

@@ -56,7 +56,6 @@ const MOCK_DEBUG_RESULTS: PatronDebugResponse = {
 };
 
 describe("DebugAuthentication", () => {
-  /* eslint-disable @typescript-eslint/no-empty-function */
   const queryClient = new QueryClient({
     defaultOptions: {
       queries: {
@@ -69,7 +68,6 @@ describe("DebugAuthentication", () => {
       error: process.env.NODE_ENV === "test" ? () => {} : console.error,
     },
   });
-  /* eslint-enable @typescript-eslint/no-empty-function */
 
   const server = setupServer(
     http.get(AUTH_METHODS_PATH, () =>

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

@@ -55,7 +55,6 @@ const setupMockServer = () => {
 };
 
 describe("InventoryReportRequestModal", () => {
-  /* eslint-disable @typescript-eslint/no-empty-function */
   const queryClient = new QueryClient({
     defaultOptions: {
       queries: {
@@ -68,7 +67,6 @@ describe("InventoryReportRequestModal", () => {
       error: process.env.NODE_ENV === "test" ? () => {} : console.error,
     },
   });
-  /* eslint-enable @typescript-eslint/no-empty-function */
 
   describe("query hooks call correct api methods", () => {
     const wrapper = componentWithProviders({ queryClient });

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

@@ -1,6 +1,5 @@
 import * as React from "react";
 import { render, screen, act, fireEvent } from "@testing-library/react";
-import userEvent from "@testing-library/user-event";
 import JsonField, { JsonFieldHandle } from "../../../src/components/JsonField";
 
 const setting = {

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

@@ -12,7 +12,7 @@ import LaneEditor from "../../../src/components/LaneEditor";
 
 jest.mock("../../../src/components/LaneCustomListsEditor", () => ({
   __esModule: true,
-  default: (props) => <div data-testid="LaneCustomListsEditor" />,
+  default: () => <div data-testid="LaneCustomListsEditor" />,
 }));
 
 const customListsData = [

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

@@ -1,5 +1,5 @@
 import * as React from "react";
-import { render, screen, waitFor } from "@testing-library/react";
+import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { PatronBlockingRulesHelpModal } from "../../../src/components/PatronBlockingRulesHelpModal";
 
@@ -29,9 +29,7 @@ describe("PatronBlockingRulesHelpModal", () => {
 
   it("does not render when show is false", () => {
     render(<PatronBlockingRulesHelpModal {...baseProps} show={false} />);
-    expect(
-      screen.queryByText(/Patron Blocking Rules — Help/i)
-    ).toBeNull();
+    expect(screen.queryByText(/Patron Blocking Rules — Help/i)).toBeNull();
   });
 
   it("shows a loading indicator when fieldsLoading is true", () => {
@@ -84,7 +82,9 @@ describe("PatronBlockingRulesHelpModal", () => {
       />
     );
     expect(
-      screen.getByText(/Save the service before template variables can be fetched/i)
+      screen.getByText(
+        /Save the service before template variables can be fetched/i
+      )
     ).toBeTruthy();
     expect(screen.queryByText("fines")).toBeNull();
   });
@@ -97,9 +97,7 @@ describe("PatronBlockingRulesHelpModal", () => {
         fieldsError={null}
       />
     );
-    expect(
-      screen.getByText(/No field data available/i)
-    ).toBeTruthy();
+    expect(screen.getByText(/No field data available/i)).toBeTruthy();
   });
 
   it("renders null values as italic 'null'", () => {

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

@@ -6,7 +6,6 @@ import { LibrariesData } from "../../../src/interfaces";
 import buildStore from "../../../src/store";
 import { setupServer } from "msw/node";
 import { http, HttpResponse } from "msw";
-import renderWithContext from "../testUtils/renderWithContext";
 import { renderWithProviders } from "../testUtils/withProviders";
 import QuicksightDashboardPage from "../../../src/components/QuicksightDashboardPage";