@internetarchive/ia-book-actions 0.0.12-1 → 0.0.13-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.12-1",
+  "version": "0.0.13-1",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",
@@ -15,7 +15,7 @@
     "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:watch": "web-test-runner --watch --puppeteer"
   },
   "dependencies": {
     "@internetarchive/ia-icons": "^1.2.2",
@@ -25,6 +25,7 @@
     "@internetarchive/local-cache": "^0.2.0",
     "@internetarchive/modal-manager": "^0.1.0",
     "@internetarchive/shared-resize-observer": "^0.0.1",
+    "@web/test-runner-puppeteer": "^0.10.5",
     "lit-element": "^2.4.0",
     "lit-html": "^1.3.0"
   },

package/src/core/services/get-lending-actions.js

@@ -144,7 +144,6 @@ export default class GetLendingActions {
       primaryTitle: 'Book available to patrons with print disabilities.',
       primaryActions: [unavailable],
       primaryColor: 'primary',
-      secondaryActions: [],
     };
   }
 

package/src/core/services/loan-token-poller.js

@@ -40,6 +40,7 @@ export class LoanTokenPoller {
       }
 
       // Do an initial token, then set an interval
+      console.log('enableBookAccess => handleLoanTokenPoller');
       this.handleLoanTokenPoller(true);
 
       this.loanTokenInterval = setInterval(() => {
@@ -70,6 +71,7 @@ export class LoanTokenPoller {
   }
 
   async handleLoanTokenPoller(isInitial = false) {
+    console.log('handleLoanTokenPoller', {isInitial})
     const action = 'create_token';
     ActionsHandlerService({
       identifier: this.identifier,

package/src/ia-book-actions.js

@@ -156,6 +156,16 @@ export default class IABookActions extends LitElement {
     });
 
     this.borrowType = actions.borrowType;
+
+    const hasExpired =
+      'browsingExpired' in this.lendingStatus &&
+      this.lendingStatus?.browsingExpired;
+    console.log('***hasExpired', hasExpired);
+    if (hasExpired) {
+      this.tokenPoller?.disconnectedInterval();
+      return;
+    }
+
     if (this.borrowType === 'browsed') {
       // start timer for browsed.
       // when browse is completed, we shows browse-again button
@@ -308,6 +318,7 @@ export default class IABookActions extends LitElement {
       title: 'Lending error',
       message: errorMsg,
       headerColor: '#d9534f',
+      showCloseButton: true,
     });
 
     if (action === 'create_token') {
@@ -318,8 +329,6 @@ export default class IABookActions extends LitElement {
         refresh
       </button>`;
 
-      modalConfig.closeOnBackdropClick = false;
-      modalConfig.showCloseButton = false;
       modalConfig.message = html` Uh oh, something went wrong trying to access
         this book.<br />
         Please ${refreshButton} to try again or send us an email to

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

@@ -251,10 +251,41 @@ describe('Browsing expired status', () => {
     );
 
     await aTimeout(1500); // wait for 1.5 second
-    el.updateComplete;
+    await el.updateComplete;
+
+    expect(el.primaryTitle).contains('Your loan has expired.');
+    expect(el.primaryActions[0].text).to.equal('Borrow again');
+  });
+
+  it('Expiring book cancels interval', async () => {
+    const baseStatus = {
+      is_lendable: true,
+      user_has_browsed: false,
+      browseHasExpired: false,
+      secondsLeftOnLoan: 1,
+    };
+    const el = await fixture(
+      container({
+        userid: '@userid',
+        lendingStatus: baseStatus,
+      })
+    );
+    const browsingStatus = { ...baseStatus, user_has_browsed: true };
+    el.lendingStatus = browsingStatus;
+    await el.updateComplete;
+
+    expect(el.primaryTitle).contains('Borrow ends at ');
+    expect(el.primaryActions[0].text).to.equal('Return now');
+    expect(el.tokenPoller.loanTokenInterval).to.not.equal(undefined);
+
+    const expiredStatus = { ...browsingStatus, browsingExpired: true };
+    el.lendingStatus = expiredStatus;
+    await el.updateComplete;
+    await aTimeout(1500); // wait for 1.5 sec
 
     expect(el.primaryTitle).contains('Your loan has expired.');
     expect(el.primaryActions[0].text).to.equal('Borrow again');
+    expect(el.tokenPoller.loanTokenInterval).to.equal(undefined);
   });
 });