@internetarchive/ia-book-actions 0.0.29-alpha51 → 0.0.29-alpha52

package/package.json

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

package/src/components/timer-countdown.js

@@ -56,14 +56,11 @@ export default class TimerCountdown extends LitElement {
   }
 
   timerCountdown() {
-    // Just a QA thing-
-    // if `this.loanTotalTime` less then 600 Seconds (10min)
-    // - let just execute setInterval in each second
-    // - otherwise execute in 60 seconds
-    const timerExecutionSeconds = this.loanTotalTime <= 600 ? 1 : 60;
+    // - let just execute setInterval in every 1 minute
+    this.timerExecutionSeconds = 60;
 
     this.timerInterval = setInterval(() => {
-      this.secondsLeftOnLoan -= timerExecutionSeconds;
+      this.secondsLeftOnLoan -= this.timerExecutionSeconds;
       const secondsLeft = Math.round(this.secondsLeftOnLoan);
 
       /**
@@ -86,11 +83,11 @@ export default class TimerCountdown extends LitElement {
       }
 
       // clear interval
-      if (secondsLeft <= 1) {
+      if (secondsLeft <= 60) {
         clearInterval(this.timerInterval);
         window?.Sentry?.captureMessage(sentryLogs.clearOneHourTimer);
       }
-    }, timerExecutionSeconds * 1000);
+    }, this.timerExecutionSeconds * 1000);
   }
 
   /**
@@ -100,17 +97,11 @@ export default class TimerCountdown extends LitElement {
    * @return string
    */
   get remainingTime() {
-    let unitOfTime = 'second';
+    const unitOfTime = 'minute';
     let timeLeft = Math.round(this.secondsLeftOnLoan);
 
-    if (this.loanTotalTime <= 600) {
-      return `${timeLeft} seconds`;
-    }
-
-    if (timeLeft > 60) {
-      unitOfTime = 'minute';
-      timeLeft = Math.floor(timeLeft / 60);
-    }
+    // convert time from second to minute
+    timeLeft = Math.ceil(timeLeft / 60);
 
     return timeLeft !== 1
       ? `${timeLeft} ${unitOfTime}s`

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

@@ -114,28 +114,26 @@ export class LoanRenewHelper {
 
   /**
    * Texts we want to show in toast template including remaining time
-   * - eg. 1 minute, 50 seconds
+   * - eg. 1 minute, 2 minutes
    *
    * @param {String} texts
-   * @param {Number} time
+   * @param {Number} secondsLeft
    *
    * @returns {String} // texts will be appear in toast template
    */
-  getMessageTexts(texts, time) {
-    let unitOfTime = 'second';
+  getMessageTexts(texts, secondsLeft) {
+    const unitOfTime = 'minute';
 
     let toastTexts = texts;
-    let timeLeft = time;
+    let timeLeft = secondsLeft;
 
-    if (timeLeft > 60) {
-      unitOfTime = 'minute';
-      timeLeft = Math.floor(timeLeft / 60);
-    }
+    // convert time from second to minute
+    timeLeft = Math.ceil(timeLeft / 60);
 
-    // replace remaining time
+    // replace #time variable with remaining time
     toastTexts = toastTexts?.replace(/#time/, timeLeft);
 
-    // replace unitsOfTime eg second vs seconds / minute vs /minutes
+    // replace #unitsOfTime variable with minute/minutes
     return toastTexts?.replace(
       /#unitsOfTime/,
       timeLeft !== 1 ? `${unitOfTime}s` : unitOfTime

package/src/ia-book-actions.js

@@ -334,11 +334,15 @@ export default class IABookActions extends LitElement {
     }
     await iaBookActions.appendChild(toastTemplate);
 
+    // if secondsLeft < 60, consider it 1 minute
+    let { secondsLeft } = this.loanRenewResult;
+    secondsLeft = secondsLeft > 60 ? secondsLeft : 60;
+
     const config = new ToastConfig();
     config.dismisOnClick = true;
     config.texts = this.loanRenewHelper?.getMessageTexts(
       this.loanRenewResult.texts,
-      this.loanRenewResult.secondsLeft
+      secondsLeft
     );
 
     toastTemplate.showToast({

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

@@ -80,7 +80,7 @@ describe('Loan Renew Determine', () => {
     );
 
     expect(toastMsg).to.be.equal(
-      'This book will be automatically returned in 1 minute unless you turn a page.'
+      'This book will be automatically returned in 2 minutes unless you turn a page.'
     );
   });
 });