@internetarchive/ia-book-actions 0.1.4-alpha6 → 0.1.4-alpha7

package/demo/index.html

@@ -132,10 +132,10 @@
     iaBookActions.localCache = localCache;
 
     let loanTotalTime2Min = { loanTotalTime: 20, loanRenewAtLast: 15, pageChangedInLast: 5 };
-    let loanTotalTime5Min = { loanTotalTime: 300, loanRenewAtLast: 290, pageChangedInLast: 15 };
+    let loanTotalTime5Min = { loanTotalTime: 300, loanRenewAtLast: 230, pageChangedInLast: 15 };
     let loanTotalTime1Hour = { loanTotalTime: 3600, loanRenewAtLast: 600, pageChangedInLast: 900 };
 
-    iaBookActions.loanRenewTimeConfig = loanTotalTime2Min;
+    iaBookActions.loanRenewTimeConfig = loanTotalTime5Min;
 
     let lendingStatus1 = iaBookActions.lendingStatus;
     let secondsLeftOnLoan = iaBookActions.loanRenewTimeConfig.loanTotalTime;
@@ -298,6 +298,16 @@
         })
       );
     })
+
+    document.querySelector('.pageChangedEventSec').addEventListener('click', () => {
+      window.dispatchEvent(
+        new CustomEvent('BookReader:userAction', {
+          detail: {},
+          bubbles: true,
+          composed: true,
+        })
+      );
+    })
 </script>
 
   <div>
@@ -310,6 +320,7 @@
             </td>
             <td>
               <button class="pageChangedEvent">Page Change Event</button>
+              <button class="pageChangedEventSec">BR Controls Event</button>
             </td>
           </tr>
         </table>

package/package.json

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

package/src/ia-book-actions.js

@@ -240,7 +240,7 @@ export default class IABookActions extends LitElement {
      */
     setTimeout(
       () => {
-        this.startLoanTokenPoller();
+        if (!hasExpired) this.startLoanTokenPoller();
       },
 
       // if book is renew while reading, let's wait to execute create-token api
@@ -260,8 +260,9 @@ export default class IABookActions extends LitElement {
      * dispatched this event from bookreader page changed
      */
     window.addEventListener('BookReader:userAction', () => {
-      console.log('user action executed');
+      console.log('user action');
       this.suppressToast = true;
+      this.closeToastManager();
 
       if (this.borrowType === 'browsed') {
         this.autoLoanRenewChecker(true);
@@ -271,8 +272,7 @@ export default class IABookActions extends LitElement {
     /**
      * detect click-event on document to close toast-template
      */
-    window.addEventListener('click', e => {
-      console.log('document click executed');
+    document.addEventListener('click', e => {
       if (this.loanRenewHelper && this.loanRenewResult.secondsLeft > 0) {
         this.suppressToast = true;
       }
@@ -293,6 +293,7 @@ export default class IABookActions extends LitElement {
      * @see TimerCountdown::timerCountdown
      */
     this.addEventListener('IABookActions:loanRenew', async event => {
+      console.log('event::loanRenew');
       await this.autoLoanRenewChecker(false);
 
       // show warning message with remaining time to auto returned it.
@@ -321,6 +322,16 @@ export default class IABookActions extends LitElement {
     this.loanRenewResult = this.loanRenewHelper.result;
   }
 
+  /**
+   * close/hide toast message
+   */
+  async closeToastManager() {
+    let toastTemplate = this.shadowRoot.querySelector('toast-template');
+    if (toastTemplate) {
+      toastTemplate?.remove();
+    }
+  }
+
   /**
    * Show toast messages on some specific loan renew features. e.g.
    * - show message when book is auto renewed
@@ -330,14 +341,11 @@ export default class IABookActions extends LitElement {
   async showToastMessage() {
     if (this.suppressToast) return;
 
-    const iaBookActions = document.querySelector('ia-book-actions')?.shadowRoot;
-    if (!iaBookActions) return;
-
-    let toastTemplate = iaBookActions.querySelector('toast-template');
+    let toastTemplate = this.shadowRoot.querySelector('toast-template');
     if (!toastTemplate) {
       toastTemplate = document.createElement('toast-template');
     }
-    await iaBookActions.appendChild(toastTemplate);
+    await this.shadowRoot.appendChild(toastTemplate);
 
     // if secondsLeft < 60, consider it 1 minute
     let { secondsLeft } = this.loanRenewResult;
@@ -574,8 +582,7 @@ export default class IABookActions extends LitElement {
    *  @param {string} event.detail.data.error - error message
    */
   handleLendingActionError(event) {
-    // toggle activity loader
-    this.handleToggleActionGroup();
+    this.disableActionGroup = false;
 
     // clear all intervals for lending system when error occured
     window?.IALendingIntervals?.clearAll();
@@ -583,7 +590,8 @@ export default class IABookActions extends LitElement {
     const action = event?.detail?.action;
     const errorMsg = event?.detail?.data?.error;
 
-    if (errorMsg) this.showErrorModal(errorMsg, action);
+    // template not show create_token errors
+    if (errorMsg && action !== 'create_token') this.showErrorModal(errorMsg, action);
 
     // if error related to loan token
     // - clear tokenPoller interval
@@ -617,8 +625,6 @@ export default class IABookActions extends LitElement {
 
   /* show error message if something went wrong */
   async showErrorModal(errorMsg, action) {
-    this.disableActionGroup = false;
-
     // check if this.modal passed as prop
     if (!this.modal) {
       this.modal = document.querySelector('modal-manager');