@internetarchive/ia-book-actions 0.1.1 → 0.1.3-alpha1

package/demo/index.html

@@ -135,7 +135,7 @@
     let loanTotalTime5Min = { loanTotalTime: 300, loanRenewAtLast: 180, pageChangedInLast: 15 };
     let loanTotalTime1Hour = { loanTotalTime: 3600, loanRenewAtLast: 600, pageChangedInLast: 900 };
 
-    iaBookActions.loanRenewTimeConfig = loanTotalTime2Min;
+    iaBookActions.loanRenewTimeConfig = loanTotalTime1Hour;
 
     let lendingStatus1 = iaBookActions.lendingStatus;
     let secondsLeftOnLoan = iaBookActions.loanRenewTimeConfig.loanTotalTime;

package/package.json

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

package/src/components/timer-countdown.js

@@ -63,6 +63,12 @@ export default class TimerCountdown extends LitElement {
       this.secondsLeftOnLoan -= this.timerExecutionSeconds;
       const secondsLeft = Math.round(this.secondsLeftOnLoan);
 
+      console.log(
+        'timeLeftInSec',
+        secondsLeft,
+        ' ||| timeLeftInMin',
+        Math.ceil(secondsLeft / 60)
+      );
       /**
        * execute from last 10th minute to 0th minute
        * - 10th - to check if user has viewed
@@ -111,15 +117,14 @@ export default class TimerCountdown extends LitElement {
   render() {
     return html`
       <svg
-        width="16"
-        height="16"
+        width="14"
+        height="14"
         viewBox="0 0 100 100"
         xmlns="http://www.w3.org/2000/svg"
       >
         <circle class="circle" cx="50" cy="50" r="50" />
       </svg>
-      <span class="sr-only">${this.remainingTime}</span>
-      <span>${this.remainingTime}</span>
+      <span class="sr-only">${this.remainingTime} left</span>
     `;
   }
 
@@ -130,7 +135,8 @@ export default class TimerCountdown extends LitElement {
 
     return css`
       :host {
-        right: 5px;
+        right: 0;
+        margin-right: 10px;
         position: absolute;
       }
 

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

@@ -13,7 +13,8 @@ export class LoanRenewHelper {
     this.loanRenewTimeConfig = loanRenewTimeConfig;
 
     // messages for auto return machenism
-    this.loanRenewMessage = 'This book has been renewed for 1 hour.';
+    this.loanRenewMessage =
+      'This book has been renewed for #time #unitsOfTime.';
     this.loanReturnWarning =
       'This book will be automatically returned in #time #unitsOfTime unless you turn a page.';
 
@@ -117,7 +118,7 @@ export class LoanRenewHelper {
    * @returns {String} // texts will be appear in toast template
    */
   getMessageTexts(texts, secondsLeft) {
-    const unitOfTime = 'minute';
+    let unitOfTime = 'minute';
 
     let toastTexts = texts;
     let timeLeft = secondsLeft;
@@ -125,6 +126,12 @@ export class LoanRenewHelper {
     // convert time from second to minute
     timeLeft = Math.ceil(timeLeft / 60);
 
+    // convert minute to hour
+    if (timeLeft === 60) {
+      timeLeft = 1; // 1 hour
+      unitOfTime = 'hour';
+    }
+
     // replace #time variable with remaining time
     toastTexts = toastTexts?.replace(/#time/, timeLeft);
 

package/src/ia-book-actions.js

@@ -336,7 +336,11 @@ export default class IABookActions extends LitElement {
 
     // if secondsLeft < 60, consider it 1 minute
     let { secondsLeft } = this.loanRenewResult;
-    secondsLeft = secondsLeft > 60 ? secondsLeft : 60;
+    if (secondsLeft === undefined) {
+      secondsLeft = this.lendingStatus.secondsLeftOnLoan;
+    } else {
+      secondsLeft = secondsLeft > 60 ? secondsLeft : 60;
+    }
 
     const config = new ToastConfig();
     config.dismisOnClick = true;
@@ -498,8 +502,8 @@ export default class IABookActions extends LitElement {
       this.tokenPoller?.disconnectedInterval();
 
       this.suppressToast = false;
-      await this.showToastMessage();
       await this.browseHasRenew();
+      await this.showToastMessage();
       await this.resetTimerCountState();
 
       window?.Sentry?.captureMessage(`${sentryLogs.bookHasRenewed}`);