@internetarchive/ia-book-actions 0.1.11-b40 → 0.1.11-b41

package/package.json

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

package/src/components/timer-countdown.js

@@ -47,9 +47,6 @@ export default class TimerCountdown extends LitElement {
   }
 
   render() {
-    console.log('~~~~~~~');
-    console.log('render -- timer-countdown', this.secondsLeftOnLoan);
-    console.log('~~~~~~~');
     const viewClass = this.displayTime ? 'view' : 'hide';
     return html`
       <button

package/src/core/config/constants.js

@@ -6,4 +6,4 @@ export const mobileContainerWidth = 700;
 /**
  * shift the actions buttons in dropdown
  */
-export const tabletContainerWidth = 895;
+export const tabletContainerWidth = 800;

package/src/core/config/ia-lending-intervals.js

@@ -1,3 +1,4 @@
+/* global: window */
 /**
  * Collection of methods for managing intervals for lending system
  *
@@ -18,16 +19,19 @@ window.IALendingIntervals = {
   tokenPoller: 0,
 
   /**
-   * store timer-countdown interval
-   * @see TimerCountdown::timerCountdown
+   * renewal check interval
    */
   timerCountdown: 0,
 
+  /** expiration timer */
+  browseExpireTimeout: 0,
+
   /**
    * clear interval for create_token api
    */
   clearTokenPoller: () => {
-    window.clearInterval(window?.IALendingIntervals?.tokenPoller);
+    window.clearInterval(window.IALendingIntervals.tokenPoller);
+    window.IALendingIntervals.tokenPoller = 0;
   },
 
   /**
@@ -35,13 +39,23 @@ window.IALendingIntervals = {
    */
   clearTimerCountdown: () => {
     window.clearInterval(window.IALendingIntervals.timerCountdown);
+    window.IALendingIntervals.timerCountdown = 0;
+  },
+
+  /**
+   * clear interval for graphic timer for one-hour loan renew
+   */
+  clearBrowseExpireTimeout: () => {
+    window.clearTimeout(window.IALendingIntervals.browseExpireTimeout);
+    window.IALendingIntervals.browseExpireTimeout = 0;
   },
 
   /**
    * clear all intervals being used acros lending system
    */
   clearAll: () => {
-    window.clearInterval(window?.IALendingIntervals?.tokenPoller);
-    window.clearInterval(window?.IALendingIntervals?.timerCountdown);
+    window?.IALendingIntervals?.clearTokenPoller();
+    window?.IALendingIntervals?.clearTimerCountdown();
+    window.IALendingIntervals.clearBrowseExpireTimeout();
   },
 };

package/src/core/services/actions-handler/actions-handler.js

@@ -7,6 +7,10 @@ import log from '../log.js';
 import ActionsHandlerService from './actions-handler-service.js';
 import LoanAnanlytics from '../loan-analytics.js';
 import * as Cookies from '../doc-cookies.js';
+import {
+  analyticsCategories,
+  analyticsActions,
+} from '../../config/analytics-event-and-category.js';
 
 /**
  * These are callback functions calling from actions-config.js file.
@@ -39,24 +43,53 @@ export default class ActionsHandler extends LitElement {
   }
 
   bindEvents() {
-    this.addEventListener('browseBook', () => {
+    this.addEventListener('browseBook', async () => {
       this.handleBrowseIt();
-      this.loanAnanlytics?.storeLoanStatsCount(this.identifier, 'browse');
+      await this.loanAnanlytics?.storeLoanStatsCount(this.identifier, 'browse');
+      this.loanAnanlytics?.sendEvent(
+        analyticsCategories.browse,
+        analyticsActions.browse
+      );
     });
 
-    this.addEventListener('browseBookAgain', () => {
+    this.addEventListener('browseBookAgain', async () => {
       this.handleBrowseIt();
-      this.loanAnanlytics?.storeLoanStatsCount(this.identifier, 'browseagain');
+      await this.loanAnanlytics?.storeLoanStatsCount(
+        this.identifier,
+        'browseagain'
+      );
+      this.loanAnanlytics?.sendEvent(
+        analyticsCategories.browse,
+        analyticsActions.browseBookAgain
+      );
     });
 
-    this.addEventListener('autoRenew', () => {
+    this.addEventListener('autoRenew', async () => {
       this.handleLoanRenewNow();
-      this.loanAnanlytics?.storeLoanStatsCount(this.identifier, 'autorenew');
+      await this.loanAnanlytics?.storeLoanStatsCount(
+        this.identifier,
+        'autorenew'
+      );
+      this.loanAnanlytics?.sendEvent(
+        analyticsCategories.browse,
+        analyticsActions.browseAutoRenew
+      );
     });
 
-    this.addEventListener('autoReturn', () => {
+    this.addEventListener('autoReturn', async () => {
       this.handleReturnIt();
-      this.loanAnanlytics?.storeLoanStatsCount(this.identifier, 'autoreturn');
+      await this.loanAnanlytics?.storeLoanStatsCount(
+        this.identifier,
+        'autoreturn'
+      );
+      await this.loanAnanlytics?.storeLoanStatsCount(
+        this.identifier,
+        'autorenew'
+      );
+      this.loanAnanlytics?.sendEvent(
+        analyticsCategories.browse,
+        analyticsActions.browseAutoReturn
+      );
     });
 
     this.addEventListener('returnNow', ({ detail }) => {

package/src/ia-book-actions.js

@@ -71,7 +71,7 @@ export default class IABookActions extends LitElement {
     this.identifier = '';
     this.bookTitle = '';
     this.returnUrl = '';
-    this.lendingStatus = {};
+    this.lendingStatus = {}; // very important as components feed from this
     this.width = 0;
     this.bwbPurchaseUrl = '';
     this.lendingBarPostInit = () => {};
@@ -86,8 +86,8 @@ export default class IABookActions extends LitElement {
     this.primaryColor = 'primary';
     this.secondaryActions = [];
     this.lendingOptions = {};
-    this.borrowType = null; // (browsed|borrowed)
-    this.browseTimer = undefined;
+    this.borrowType = null; // 'browsed'|'borrowed'
+    this.browseTimer = undefined; // timeout
     this.timerExecutionSeconds = 30;
 
     /** @deprecated */
@@ -149,7 +149,6 @@ export default class IABookActions extends LitElement {
   updated(changed) {
     if (changed.has('lendingStatus') || changed.has('bwbPurchaseUrl')) {
       this.setupLendingToolbarActions();
-      this.update();
     }
 
     if (changed.has('sharedObserver')) {
@@ -255,6 +254,8 @@ export default class IABookActions extends LitElement {
     setTimeout(() => {
       if (!hasExpired) this.startLoanTokenPoller();
     }, 100);
+
+    this.requestUpdate();
   }
 
   /**
@@ -547,18 +548,19 @@ export default class IABookActions extends LitElement {
   }
 
   async startBrowseTimer() {
-    clearTimeout(this.browseTimer);
+    window.IALendingIntervals.clearBrowseExpireTimeout();
+
     const {
       browsingExpired,
       user_has_browsed,
       secondsLeftOnLoan,
     } = this.lendingStatus;
 
-    log(
-      'startBrowseTimerstartBrowseTimer just cleared timer',
-      this.browseTimer,
-      { browsingExpired, user_has_browsed, secondsLeftOnLoan }
-    );
+    log('startBrowseTimerstartBrowseTimer just cleared timer', {
+      browsingExpired,
+      user_has_browsed,
+      secondsLeftOnLoan,
+    });
 
     if (!user_has_browsed || browsingExpired) {
       log('user not browsed', {
@@ -569,7 +571,7 @@ export default class IABookActions extends LitElement {
       return;
     }
 
-    this.browseTimer = setTimeout(() => {
+    window.IALendingIntervals.browseExpireTimeout = setTimeout(() => {
       log(
         'start `this.browseTimer will fire his.browseHasExpired() - secondsLeftOnLoan',
         secondsLeftOnLoan