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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.12-1",
+  "version": "0.0.12-2",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",

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

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

package/src/ia-book-actions.js

@@ -162,6 +162,10 @@ export default class IABookActions extends LitElement {
       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();
@@ -261,6 +265,7 @@ 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
@@ -268,8 +273,9 @@ 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);
+    if (errorMsg) this.showErrorModal(errorMsg, action, loanExpired);
 
     // update action bar state if book is not available to browse or borrow.
     if (errorMsg && errorMsg.match(/not available to borrow/gm)) {
@@ -290,7 +296,7 @@ export default class IABookActions extends LitElement {
   }
 
   /* show error message if something went wrong */
-  async showErrorModal(errorMsg, action) {
+  async showErrorModal(errorMsg, action, loanExpired) {
     this.disableActionGroup = false;
 
     // check if this.modal passed as prop
@@ -311,23 +317,14 @@ export default class IABookActions extends LitElement {
     });
 
     if (action === 'create_token') {
-      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.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
-        <a
-          href="mailto:info@archive.org?subject=Help: cannot access my borrowed book: ${this
-            .identifier}"
-          >info@archive.org</a
-        >`;
+      if (loanExpired) {
+        modalConfig.showCloseButton = true;
+        modalConfig.message = this.loanExpiredMessage;
+      } else {
+        modalConfig.showCloseButton = false;
+        modalConfig.message = this.loanErrorMessage;
+      }
     }
 
     this.modal.showModal({
@@ -335,6 +332,29 @@ 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';
   }