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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.12-2",
+  "version": "0.0.13-2",
   "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/loan-token-poller.js

@@ -76,12 +76,7 @@ export class LoanTokenPoller {
       action,
       error: data => {
         this.disconnectedInterval(); // stop token fetch api
-
-        if (isInitial) {
-          this.errorCallback({ detail: { action, data } });
-        } else {
-          this.errorCallback({ detail: { action, data, isExpired: true } });
-        }
+        this.errorCallback({ detail: { action, data } });
       },
       success: () => {
         if (isInitial) this.successCallback();

package/src/ia-book-actions.js

@@ -156,16 +156,21 @@ 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
       this.startBrowseTimer();
     }
 
-    if (this.lendingStatus.browsingExpired) {
-      this.tokenPoller.disconnectedInterval();
-    }
-
     // early return if not borrowed or no action-bar
     if (!this.borrowType || this.barType === 'title') {
       this.lendingBarPostInit();
@@ -265,7 +270,6 @@ export default class IABookActions extends LitElement {
    * @param {Object} event - The employee who is responsible for the project
    *  @param {string} event.detail.action - action when error occurred like 'browseBook', 'borrowBook'
    *  @param {string} event.detail.data.error - error message
-   *  @param {string} event.detail.data.isExpired - triggered when loan is expired
    */
   handleLendingActionError(event) {
     // toggle activity loader
@@ -273,9 +277,8 @@ export default class IABookActions extends LitElement {
 
     const action = event?.detail?.action;
     const errorMsg = event?.detail?.data?.error;
-    const loanExpired = event?.detail?.data?.isExpired;
 
-    if (errorMsg) this.showErrorModal(errorMsg, action, loanExpired);
+    if (errorMsg) this.showErrorModal(errorMsg, action);
 
     // update action bar state if book is not available to browse or borrow.
     if (errorMsg && errorMsg.match(/not available to borrow/gm)) {
@@ -296,7 +299,7 @@ export default class IABookActions extends LitElement {
   }
 
   /* show error message if something went wrong */
-  async showErrorModal(errorMsg, action, loanExpired) {
+  async showErrorModal(errorMsg, action) {
     this.disableActionGroup = false;
 
     // check if this.modal passed as prop
@@ -314,17 +317,25 @@ export default class IABookActions extends LitElement {
       title: 'Lending error',
       message: errorMsg,
       headerColor: '#d9534f',
+      showCloseButton: true,
     });
 
     if (action === 'create_token') {
-      modalConfig.closeOnBackdropClick = false;
-      if (loanExpired) {
-        modalConfig.showCloseButton = true;
-        modalConfig.message = this.loanExpiredMessage;
-      } else {
-        modalConfig.showCloseButton = false;
-        modalConfig.message = this.loanErrorMessage;
-      }
+      const refreshButton = html`<button
+        style="background:none;font-size:inherit;border:0;padding:0;color:#0000ee;cursor:pointer;text-decoration:underline"
+        @click=${() => window.location.reload(true)}
+      >
+        refresh
+      </button>`;
+
+      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
+        <a
+          href="mailto:info@archive.org?subject=Help: cannot access my borrowed book: ${this
+            .identifier}"
+          >info@archive.org</a
+        >`;
     }
 
     this.modal.showModal({
@@ -332,29 +343,6 @@ export default class IABookActions extends LitElement {
     });
   }
 
-  /* eslint-disable class-methods-use-this */
-  get loanExpiredMessage() {
-    return html`Your current loan is expired, please close this model and click
-      on <strong>Borrow Again</strong> button to continue reading this book`;
-  }
-
-  get loanErrorMessage() {
-    const refreshButton = html`<button
-      style="background:none;font-size:inherit;border:0;padding:0;color:#0000ee;cursor:pointer;text-decoration:underline"
-      @click=${() => window.location.reload(true)}
-    >
-      refresh
-    </button>`;
-
-    return html`Uh oh, something went wrong trying to access this book.<br />
-      Please ${refreshButton} to try again or send us an email to
-      <a
-        href="mailto:info@archive.org?subject=Help: cannot access my borrowed book: ${this
-          .identifier}"
-        >info@archive.org</a
-      >`;
-  }
-
   get iconClass() {
     return this.width <= mobileContainerWidth ? 'mobile' : 'desktop';
   }

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);
   });
 });