@internetarchive/ia-book-actions 0.0.29-alpha29 → 0.0.29-alpha30

package/demo/index.html

@@ -127,8 +127,8 @@
     iaBookActions.returnUrl = 'https://openlibrary.org';
     iaBookActions.localCache = localCache;
     iaBookActions.loanRenewConfig = {
-      totalTime: 20, // 60 second = 1 min
-      autoCheckAt: 12, // totalTime - 10th minute
+      totalTime: 70, // 60 second = 1 min
+      autoCheckAt: 65, // totalTime - 10th minute
       pageChangedInLast: 5, // within last 15 second/minute
       env: 'dev', // dev/prod
     };
@@ -284,8 +284,8 @@
     document.querySelector('.pageChangedEvent').addEventListener('click', () => {
       // dispatch event to say book page has flipped
       document.querySelector('ia-book-actions').dispatchEvent(
-        new CustomEvent('BookReader:pageChanged', {
-          detail: { props: { hasPageChanged: true }},
+        new CustomEvent('BookReader:userAction', {
+          detail: {},
           bubbles: true,
           composed: true,
         })

package/package.json

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

package/src/core/services/loan-renew-helper.js

@@ -13,7 +13,7 @@ export class LoanRenewHelper {
     // messages for auto return machenism
     this.loanRenewMessage = 'This book has been renewed for 1 hour.';
     this.loanReturnWarning =
-      'This book will be automatically returned in #time minutes unless you turn a page.';
+      'This book will be automatically returned in #time #unitsOfTime unless you turn a page.';
 
     // private props
     this.result = {
@@ -93,7 +93,7 @@ export class LoanRenewHelper {
     ) {
       this.result.texts = this.loanReturnWarning;
       this.result.renewNow = false; // not viewed
-      console.log('not viewed!');
+      // console.log('not viewed!');
     } else if (lastPageFlipTime >= lastFlipTimeFrame) {
       this.result.texts = '';
       this.result.renewNow = true; // viewed in last time frame
@@ -114,6 +114,34 @@ export class LoanRenewHelper {
     });
   }
 
+  /**
+   * Texts we want to show in toast template including remaining time
+   * - eg. 1 minute, 50 seconds
+   *
+   * @param {String} texts
+   * @param {Number} time
+   *
+   * @returns {String} // texts will be appear in toast template
+   */
+  getMessageTexts(texts, time) {
+    let unitOfTime = 'second';
+
+    let timeLeft = time;
+    let toastTexts = time;
+
+    if (timeLeft > 60) {
+      unitOfTime = 'minute';
+      timeLeft = 1;
+    }
+
+    toastTexts = toastTexts?.replace(/#time/, timeLeft);
+
+    return toastTexts?.replace(
+      /#unitsOfTime/,
+      timeLeft !== 1 ? `${unitOfTime}s` : unitOfTime
+    );
+  }
+
   /**
    * Helper function to get time difference
    *

package/src/ia-book-actions.js

@@ -156,6 +156,8 @@ export default class IABookActions extends LitElement {
   /** End SharedObserver resize handler */
 
   async setupLendingToolbarActions() {
+    this.suppressToast = false;
+
     this.lendingOptions = new GetLendingActions(
       this.userid,
       this.identifier,
@@ -237,7 +239,7 @@ export default class IABookActions extends LitElement {
     /**
      * dispatched this event from bookreader page changed
      */
-    window.addEventListener('BookReader:userAction', event => {
+    window.addEventListener('BookReader:userAction', () => {
       if (this.borrowType === 'browsed') {
         console.log('user-action executed!');
         this.autoLoanRenewChecker(true);
@@ -281,7 +283,7 @@ export default class IABookActions extends LitElement {
     );
 
     await this.loanRenewHelper.handleLoanRenew();
-    console.log(this.loanRenewResult);
+    // console.log(this.loanRenewResult.timeLeft);
     this.loanRenewResult = this.loanRenewHelper.result;
   }
 
@@ -302,8 +304,8 @@ export default class IABookActions extends LitElement {
     await iaBookActions.appendChild(toastTemplate);
 
     const config = new ToastConfig();
-    config.texts = this.loanRenewResult.texts?.replace(
-      /#time/,
+    config.texts = this.loanRenewHelper.getMessageTexts(
+      this.loanRenewResult.texts,
       this.loanRenewResult.timeLeft
     );
     config.dismisOnClick = true;