@internetarchive/ia-book-actions 0.0.14 → 0.0.16-1

package/demo/index.html

@@ -119,6 +119,7 @@
     iaBookActions.modalConfig = modalConfig;
     iaBookActions.lendingBarPostInit = lendingBarPostInit;
     iaBookActions.tokenDelay = 2000; // 2 seconds
+    iaBookActions.loansUrl = 'https://openlibrary.org';
 
     let lendingStatus1 = iaBookActions.lendingStatus;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.14",
+  "version": "0.0.16-1",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",
@@ -13,9 +13,9 @@
     "start": "web-dev-server",
     "lint": "eslint --ext .js,.html . --ignore-path .gitignore && prettier \"**/*.js\" --check --ignore-path .gitignore",
     "format": "eslint --ext .js,.html . --fix --ignore-path .gitignore && prettier \"**/*.js\" --write --ignore-path .gitignore",
-    "test": "yarn run lint && web-test-runner --coverage",
-    "test:fast": "web-test-runner --coverage",
-    "test:watch": "web-test-runner --watch"
+    "test": "yarn run lint && yarn test:fast",
+    "test:fast": "web-test-runner --coverage --playwright --browsers chromium firefox webkit",
+    "test:watch": "web-test-runner --watch --playwright --browsers chromium firefox webkit"
   },
   "dependencies": {
     "@internetarchive/ia-icons": "^1.2.2",
@@ -33,7 +33,8 @@
     "@open-wc/testing": "^2.0.0",
     "@web/dev-server": "^0.1.1",
     "@web/dev-server-esbuild": "^0.2.16",
-    "@web/test-runner": "^0.11.5",
+    "@web/test-runner": "^0.11.7",
+    "@web/test-runner-playwright": "^0.8.8",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.22.1",

package/src/components/collapsible-action-group.js

@@ -27,6 +27,7 @@ export class CollapsibleActionGroup extends ActionsHandler {
       hasAdminAccess: { type: Boolean },
       dropdownArrow: { type: String },
       disabled: { type: Boolean },
+      loansUrl: { type: String },
     };
   }
 
@@ -45,6 +46,7 @@ export class CollapsibleActionGroup extends ActionsHandler {
     this.title = '';
     this.loaderIcon = 'https://archive.org/upload/images/tree/loading.gif';
     this.disabled = false;
+    this.loansUrl = '';
   }
 
   updated(changed) {

package/src/core/services/actions-handler/actions-handler.js

@@ -13,11 +13,18 @@ import * as Cookies from '../doc-cookies.js';
  */
 
 export default class ActionsHandler extends LitElement {
+  static properties() {
+    return {
+      loansUrl: { type: String },
+    };
+  }
+
   constructor(identifier) {
     super();
     this.identifier = identifier;
     this.ajaxTimeout = 6000;
     this.bindEvents();
+    this.loansUrl = '';
   }
 
   sendEvent(eventCategory, eventAction) {
@@ -121,7 +128,7 @@ export default class ActionsHandler extends LitElement {
       identifier: this.identifier,
       success: () => {
         this.deleteLoanCookies();
-        URLHelper.goToUrl(`/details/${this.identifier}`, true);
+        URLHelper.goToUrl(this.loansUrl, true);
       },
       error: data => {
         this.dispatchActionError(action, data);

package/src/ia-book-actions.js

@@ -13,6 +13,10 @@ import GetLendingActions from './core/services/get-lending-actions.js';
 import { mobileContainerWidth } from './core/config/constants.js';
 import { LoanTokenPoller } from './core/services/loan-token-poller.js';
 
+export const events = {
+  browseExpired: 'IABookReader:BrowsingHasExpired',
+};
+
 export default class IABookActions extends LitElement {
   static get properties() {
     return {
@@ -20,6 +24,7 @@ export default class IABookActions extends LitElement {
       identifier: { type: String },
       bookTitle: { type: String },
       lendingStatus: { type: Object },
+      loansUrl: { type: String },
       width: { type: Number },
       bwbPurchaseUrl: { type: String },
       lendingBarPostInit: {
@@ -39,6 +44,7 @@ export default class IABookActions extends LitElement {
     this.userid = '';
     this.identifier = '';
     this.bookTitle = '';
+    this.loansUrl = '';
     this.lendingStatus = {};
     this.width = 0;
     this.bwbPurchaseUrl = '';
@@ -162,6 +168,14 @@ export default class IABookActions extends LitElement {
       this.lendingStatus?.browsingExpired;
     if (hasExpired) {
       this.tokenPoller?.disconnectedInterval();
+      /** Global event - always fire */
+      this.dispatchEvent(
+        new Event(events.browseExpired, {
+          bubbles: true,
+          cancelable: false,
+          composed: true,
+        })
+      );
       return;
     }
 
@@ -209,6 +223,7 @@ export default class IABookActions extends LitElement {
         .secondaryActions=${this.secondaryActions}
         .width=${this.width}
         .borrowType=${this.borrowType}
+        .loansUrl=${this.loansUrl}
         ?hasAdminAccess=${this.hasAdminAccess}
         ?disabled=${this.disableActionGroup}
         @lendingActionError=${this.handleLendingActionError}

package/test/components/collapsible-action-group.test.js

@@ -29,6 +29,7 @@ const container = ({
     .primaryActions=${primaryActions}
     .secondaryActions=${secondaryActions}
     .borrowType=${borrowType}
+    .loansUrl=${'https://openlibrary.org'}
   ></collapsible-action-group>`;
 
 describe('<collapsible-action-group>', () => {
@@ -83,4 +84,8 @@ describe('<collapsible-action-group>', () => {
     expect(eAnalytics.category).to.equal('Lending');
     expect(eAnalytics.action).to.equal('Browse');
   });
+  it('receives `loanUrl`', async () => {
+    const el = await fixture(container());
+    expect(el.loansUrl).to.equal('https://openlibrary.org');
+  });
 });

package/test/ia-book-actions.test.js

@@ -257,12 +257,10 @@ describe('Browsing expired status', () => {
     expect(el.primaryActions[0].text).to.equal('Borrow again');
   });
 
-  it('Expiring book cancels interval', async () => {
+  it('Expiring book cancels interval & emits event', async () => {
     const baseStatus = {
       is_lendable: true,
       user_has_browsed: false,
-      browseHasExpired: false,
-      secondsLeftOnLoan: 1,
     };
     const el = await fixture(
       container({
@@ -270,6 +268,13 @@ describe('Browsing expired status', () => {
         lendingStatus: baseStatus,
       })
     );
+
+    let eventReceived = false;
+    const listener = () => {
+      eventReceived = true;
+    };
+    el.addEventListener('IABookReader:BrowsingHasExpired', listener);
+
     const browsingStatus = { ...baseStatus, user_has_browsed: true };
     el.lendingStatus = browsingStatus;
     await el.updateComplete;
@@ -283,6 +288,7 @@ describe('Browsing expired status', () => {
     await el.updateComplete;
     await aTimeout(1500); // wait for 1.5 sec
 
+    expect(eventReceived).to.equal(true);
     expect(el.primaryTitle).contains('Your loan has expired.');
     expect(el.primaryActions[0].text).to.equal('Borrow again');
     expect(el.tokenPoller.loanTokenInterval).to.equal(undefined);