@internetarchive/ia-book-actions 1.1.0-alpha5 → 1.1.0-alpha7

package/demo/index.html

@@ -390,7 +390,6 @@
               </div>
               <div>
                 <button id="show_expired_modal">While Browsing (`user_has_browsed`), Expire book & show its modal</button>
-                how_expired_modal
               </div>
             </td>
             <td class="availableToBorrow">

package/package.json

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

package/src/ia-book-actions.js

@@ -90,7 +90,7 @@ export default class IABookActions extends LitElement {
     this.lendingOptions = {};
     this.borrowType = null; // 'browsed'|'borrowed'
     this.browseTimer = undefined; // timeout
-    this.timerExecutionSeconds = 2;
+    this.timerExecutionSeconds = 3;
 
     /** @deprecated */
     this.toast = undefined;
@@ -315,7 +315,7 @@ export default class IABookActions extends LitElement {
   }
 
   /**
-   * Show the warning modal to ask user if they are still reading
+   * Show the waring modal to ask user if they are still reading
    */
   async showWarningModal() {
     log('****** showWarningModal ******');
@@ -494,29 +494,28 @@ export default class IABookActions extends LitElement {
    * - show message when book is expired
    * - show message having remaining time when book is about to auto returned
    */
-  async showToastMessage() {
-    await this.useToastManager();
-
-    // if secondsLeft < 60, consider it 1 minute
-    let { secondsLeft } = this.loanRenewResult;
-    if (secondsLeft === undefined) {
-      secondsLeft = this.lendingStatus.secondsLeftOnLoan;
-    } else {
-      secondsLeft = secondsLeft > 60 ? secondsLeft : 60;
-    }
-
-    // eslint-disable-next-line no-undef
-    const config = new ToastConfig();
-    config.dismissOnClick = true;
-    config.texts = this.loanRenewHelper?.getMessageTexts(
-      this.loanRenewResult.texts,
-      secondsLeft
-    );
-
-    this.toast?.showToast({
-      config,
-    });
-  }
+  // async showToastMessage() {
+  //   await this.useToastManager();
+
+  //   // if secondsLeft < 60, consider it 1 minute
+  //   let { secondsLeft } = this.loanRenewResult;
+  //   if (secondsLeft === undefined) {
+  //     secondsLeft = this.lendingStatus.secondsLeftOnLoan;
+  //   } else {
+  //     secondsLeft = secondsLeft > 60 ? secondsLeft : 60;
+  //   }
+
+  //   const config = new ToastConfig();
+  //   config.dismisOnClick = true;
+  //   config.texts = this.loanRenewHelper?.getMessageTexts(
+  //     this.loanRenewResult.texts,
+  //     secondsLeft
+  //   );
+
+  //   this.toast?.showToast({
+  //     config,
+  //   });
+  // }
 
   /**
    * Execute when loan is expired
@@ -690,11 +689,8 @@ export default class IABookActions extends LitElement {
       // if really updated, escape from here
       const resync = await this.reSyncTimerIfGoneOff(secondsLeft);
 
-      if (resync) {
-        log('startTimerCountdown --- stale, timer has resyncd', {
-          secondsLeft,
-        });
-        return;
+      if (resync.resyncd) {
+        secondsLeft = resync.whatShouldLeft;
       }
 
       log('startTimerCountdown --- countdown still valid. continue...', {
@@ -743,28 +739,26 @@ export default class IABookActions extends LitElement {
     const whatShouldLeft = Math.round(secondsShouldLeft);
     const timerElSeconds = this.timerCountdownEl.secondsLeftOnLoan || 0;
 
-    log(`reSyncTimerIfGoneOff?`, {
-      whatIsleft,
-      whatShouldLeft,
-      timerElSeconds,
-      timeLeftInMin: Math.ceil(timerSecondsLeft / 60),
-    });
-
-    if (timerElSeconds !== whatShouldLeft || whatIsleft !== whatShouldLeft) {
+    if (whatIsleft !== whatShouldLeft) {
       // set lending status with new time to update decrementor
       const currStatus = {
         ...this.lendingStatus,
         secondsLeftOnLoan: whatShouldLeft,
       };
       this.lendingStatus = currStatus;
-    }
 
-    if (whatIsleft !== whatShouldLeft) {
-      log(`reSyncTimerIfGoneOff --- let's re-sync.`);
+      log(`reSyncTimerIfGoneOff,\nlet's re-sync --- `, {
+        whatIsleft,
+        whatShouldLeft,
+        timerElSeconds,
+        timeLeftInMin: Math.ceil(timerSecondsLeft / 60),
+      }, '\ntimer resyncd --- ', {
+        whatShouldLeft,
+      });
 
-      return true;
+      return { resyncd: true, whatShouldLeft };
     }
-    return false;
+    return { resyncd: false, whatShouldLeft };
   }
 
   /**