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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.12",
+  "version": "0.0.13-3",
   "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",

package/src/ia-book-actions.js

@@ -156,6 +156,15 @@ export default class IABookActions extends LitElement {
     });
 
     this.borrowType = actions.borrowType;
+
+    const hasExpired =
+      'browsingExpired' in this.lendingStatus &&
+      this.lendingStatus?.browsingExpired;
+    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 +317,7 @@ export default class IABookActions extends LitElement {
       title: 'Lending error',
       message: errorMsg,
       headerColor: '#d9534f',
+      showCloseButton: true,
     });
 
     if (action === 'create_token') {
@@ -318,8 +328,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);
   });
 });