@internetarchive/ia-book-actions 0.0.7-5 → 0.0.7-8

package/demo/index.html

@@ -112,6 +112,9 @@
     iaBookActions.bwbPurchaseUrl = '';
     iaBookActions.barType = '';
     iaBookActions.modalConfig = modalConfig;
+    iaBookActions.lendingBarPostInit = (event) => {
+      console.log('callback executed1!!!');
+    };
 
     let lendingStatus1 = iaBookActions.lendingStatus;
 

package/package.json

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

package/src/components/collapsible-action-group.js

@@ -27,7 +27,6 @@ export class CollapsibleActionGroup extends ActionsHandler {
       hasAdminAccess: { type: Boolean },
       dropdownArrow: { type: String },
       disabled: { type: Boolean },
-      borrowType: { type: String },
     };
   }
 
@@ -46,63 +45,14 @@ export class CollapsibleActionGroup extends ActionsHandler {
     this.title = '';
     this.loaderIcon = 'https://archive.org/upload/images/tree/loading.gif';
     this.disabled = false;
-    this.borrowType = ''; // (browsed|borrowed)
-    this.consecutiveLoanCounts = 1; // consecutive loan count
   }
 
   updated(changed) {
-    if (changed.has('width')) {
-      if (this.isBelowTabletContainer) {
-        this.resetActions();
-      }
-    }
-
-    // this is execute to fetch loan token
-    if (changed.has('borrowType')) {
-      this.emitEnableBookAccess();
+    if (changed.has('width') && this.isBelowTabletContainer) {
+      this.resetActions();
     }
   }
 
-  /**
-   * Dispatches event when patron is borrowing book.
-   * Notes borrow type, and consecutive borrow counts
-   *
-   * @fires CollapsibleActionGroup#enableBookAccess
-   */
-  async emitEnableBookAccess() {
-    // send consecutiveLoanCounts for browsed books only.
-    if (this.borrowType === 'browsed') {
-      try {
-        const existingCount = await this.localCache.get(
-          'consecutive-loan-count'
-        );
-        if (existingCount !== undefined) {
-          this.consecutiveLoanCounts = existingCount.value ?? 1;
-        }
-      } catch (error) {
-        console.log(error);
-      }
-    }
-
-    // event category and action for browsing book access
-    const eventCategory = `${this.borrowType}BookAccess`;
-    const eventAction = `${
-      this.borrowType === 'browsed' ? 'BrowseCounts-' : 'Counts-'
-    }${this.consecutiveLoanCounts}`;
-
-    this.dispatchEvent(
-      new CustomEvent('enableBookAccess', {
-        detail: {
-          event: {
-            category: eventCategory, // browsedBookAccess | borrowedBookAccess
-            action: eventAction, // (BrowseCounts-N|Counts-N)
-          },
-          borrowType: this.borrowType,
-        },
-      })
-    );
-  }
-
   /**
    * merge primaryActions and secondaryActions into dropdown
    */

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

@@ -17,17 +17,10 @@ export default class ActionsHandler extends LitElement {
     super();
     this.identifier = identifier;
     this.ajaxTimeout = 7000;
-    this.loanTokenPollingDelay =
-      window.location.pathname === '/demo/' ? 2000 : 120000; // 120000 ms = 2 min
-    this.loanTokenInterval = undefined;
     this.localCache = new LocalCache();
     this.bindEvents();
   }
 
-  disconnectedCallback() {
-    this.loanTokenInterval = undefined;
-  }
-
   sendEvent(eventCategory, eventAction) {
     // eslint-disable-next-line no-console
     console?.log('Book action: ', { eventCategory, eventAction });
@@ -102,23 +95,6 @@ export default class ActionsHandler extends LitElement {
       const { category, action } = detail.event;
       this.sendEvent(category, action);
     });
-
-    this.addEventListener('enableBookAccess', ({ detail }) => {
-      const borrowType = detail?.borrowType;
-
-      // fetch loan token for browsed/borrowed book and set an interval
-      if (borrowType) {
-        this.loanTokenInterval = setInterval(() => {
-          this.handleLoanTokenPoller();
-        }, this.loanTokenPollingDelay);
-
-        const { category, action } = detail?.event;
-        this.sendEvent(category, action);
-      } else {
-        // if book is not browsed, just clear token polling interval
-        clearInterval(this.loanTokenInterval);
-      }
-    });
   }
 
   handleBrowseIt() {
@@ -202,17 +178,6 @@ export default class ActionsHandler extends LitElement {
     });
   }
 
-  handleLoanTokenPoller() {
-    const action = 'create_token';
-    ActionsHandlerService({
-      identifier: this.identifier,
-      action,
-      error: data => {
-        this.dispatchActionError(action, data);
-        clearInterval(this.loanTokenInterval); // stop token fetch api
-      },
-    });
-  }
 
   /**
    * Dispatches event when an error occured on action

package/src/core/services/loan-token-poller.js

@@ -0,0 +1,104 @@
+import { LitElement } from 'lit-element';
+import { LocalCache } from '@internetarchive/local-cache';
+
+import ActionsHandlerService from './actions-handler/actions-handler-service.js';
+
+/**
+ * This class is used to create loan token for borrowed books
+ *
+ * ActionsHandlerService is a function being used to execute
+ */
+export class LoanTokenPoller extends LitElement {
+  constructor() {
+    super();
+    this.identifier = '';
+    this.loanTokenPollingDelay = window.location.pathname === '/demo/' ? 2000 : 120000; // 120000 ms = 2 min
+    this.loanTokenInterval = undefined;
+    this.localCache = new LocalCache();
+  }
+
+  disconnectedCallback() {
+    this.loanTokenInterval = undefined;
+  }
+
+  async enableBookAccess(identifier, borrowType) {
+    this.identifier = identifier
+    let consecutiveLoanCounts = 1;
+
+    if (borrowType) {
+      // send consecutiveLoanCounts for browsed books only.
+      if (borrowType === 'browsed') {
+        try {
+          const existingCount = await this.localCache.get(
+            'consecutive-loan-count'
+          );
+          consecutiveLoanCounts = existingCount ?? 1;
+        } catch (error) {
+          console.log(error);
+        }
+      }
+
+      // Do an initial token, then set an interval
+      this.handleLoanTokenPoller();
+
+      this.loanTokenInterval = setInterval(() => {
+        this.handleLoanTokenPoller();
+      }, this.loanTokenPollingDelay);
+
+      // event category and action for browsing book access
+      const category = `${borrowType}BookAccess`;
+      const action = `${
+        borrowType === 'browsed' ? 'BrowseCounts-' : 'Counts-'
+      }${consecutiveLoanCounts}`;
+      console.log(consecutiveLoanCounts)
+      this.sendEvent(category, action);
+    } else {
+      // if book is not browsed, just clear token polling interval
+      clearInterval(this.loanTokenInterval);
+    }
+  }
+
+  sendEvent(eventCategory, eventAction) {
+    // eslint-disable-next-line no-console
+    console?.log('Book action: ', { eventCategory, eventAction });
+    window?.archive_analytics?.send_event_no_sampling(
+      eventCategory,
+      eventAction,
+      `identifier=${this.identifier}`
+    );
+  }
+
+  async handleLoanTokenPoller() {
+    const action = 'create_token';
+    await new Promise(r => setTimeout(r, 3000));
+    console.log('here');
+    ActionsHandlerService({
+      identifier: this.identifier,
+      action,
+      error: data => {
+        console.log('error', data);
+        this.handleLendingActionError({detail: { action, data }})
+        // this.dispatchActionError(action, data);
+        clearInterval(this.loanTokenInterval); // stop token fetch api
+      },
+    });
+  }
+
+  /**
+   * Dispatches event when an error occured on action
+   * Notes:- toggle <collapsible-action-group> visibility (enable/disable).
+   *
+   * @param { String } action - name of action like browse_book, borrow_book
+   * @param { Object } data - erroneous response from api call
+   *
+   * @fires ActionsHandler#lendingActionError
+   */
+  dispatchActionError(action, data = {}) {
+    console.log('disptaced');
+    this.dispatchEvent(
+      new CustomEvent('lendingActionError', {
+        detail: { action, data },
+      })
+    );
+  }
+}

package/src/ia-book-actions.js

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import { html, css, LitElement } from 'lit-element';
+import { html, css } from 'lit-element';
 
 import { SharedResizeObserver } from '@internetarchive/shared-resize-observer';
 import { ModalConfig } from '@internetarchive/modal-manager';
@@ -11,8 +11,9 @@ import './components/info-icon.js';
 
 import GetLendingActions from './core/services/get-lending-actions.js';
 import { mobileContainerWidth } from './core/config/constants.js';
+import { LoanTokenPoller } from './core/services/loan-token-poller.js';
 
-export default class IABookActions extends LitElement {
+export default class IABookActions extends LoanTokenPoller {
   static get properties() {
     return {
       userid: { type: String },
@@ -21,6 +22,7 @@ export default class IABookActions extends LitElement {
       lendingStatus: { type: Object },
       width: { type: Number },
       bwbPurchaseUrl: { type: String },
+      lendingBarPostInit: { type: Function },
       barType: { type: String },
       sharedObserver: { attribute: false },
       disableActionGroup: { type: Boolean },
@@ -36,6 +38,7 @@ export default class IABookActions extends LitElement {
     this.lendingStatus = {};
     this.width = 0;
     this.bwbPurchaseUrl = '';
+    this.lendingBarPostInit = () => {};
     this.barType = 'action'; // 'title'|'action'
     this.sharedObserver = undefined;
     this.disableActionGroup = false;
@@ -47,6 +50,8 @@ export default class IABookActions extends LitElement {
     this.primaryColor = 'primary';
     this.secondaryActions = [];
     this.lendingOptions = {};
+    this.borrowType = ''; // (browsed|borrowed)
+    this.consecutiveLoanCounts = 1; // consecutive loan count
   }
 
   disconnectedCallback() {
@@ -58,8 +63,6 @@ export default class IABookActions extends LitElement {
       this.sharedObserver = new SharedResizeObserver();
       this.setupResizeObserver();
     }
-
-    this.setupLendingToolbarActions();
   }
 
   updated(changed) {
@@ -153,14 +156,26 @@ export default class IABookActions extends LitElement {
       // when browse is completed, we shows browse-again button
       this.startBrowseTimer();
     }
+
+    // enable access of borrowed/browsed books
+    if (this.borrowType) {
+      await this.enableBookAccess(this.identifier, this.borrowType);
+    }
+
+    /**
+     * this callback function use to:-
+     * - disptach lenfingFlow::PostInit event
+     * - initialize bookreader using br.init()
+     */
+    this.lendingBarPostInit();
   }
 
   render() {
-    return html`
-      <section class="lending-wrapper">
-        ${this.barType === 'title' ? this.bookTitleBar : this.bookActionBar}
-      </section>
-    `;
+    if (this.barType === 'title') {
+      return html`<section class="lending-wrapper">${this.bookTitleBar}</section>`;
+    }
+
+    return html`<section class="lending-wrapper">${this.bookActionBar}</section>`;
   }
 
   get bookTitleBar() {