@internetarchive/ia-book-actions 0.0.7-11 → 0.0.7-12

package/demo/index.html

@@ -106,16 +106,17 @@
 
     let lendingBarPostInit = function lendingBarPostInit() {
       setTimeout(function() {
-        console.log('executed');
+        console.log('executed', 'br.init()');
       }, 100);
     }
+
     // set defaultLendingStatus for unavailable (without borrowables) book
     iaBookActions.userid = userid;
     iaBookActions.identifier = identifier;
     iaBookActions.bookTitle = 'Contemporary Black biography. Volume 39 : profiles from the interContemporary Black biography. Volume 39';
     iaBookActions.lendingStatus = canBrowseAndBorrow;
     iaBookActions.bwbPurchaseUrl = '';
-    iaBookActions.barType = '';
+    // iaBookActions.barType = '';
     iaBookActions.modalConfig = modalConfig;
     iaBookActions.lendingBarPostInit = lendingBarPostInit;
 

package/package.json

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

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

@@ -178,7 +178,6 @@ export default class ActionsHandler extends LitElement {
     });
   }
 
-
   /**
    * Dispatches event when an error occured on action
    * Notes:- toggle <collapsible-action-group> visibility (enable/disable).

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

@@ -12,8 +12,9 @@ export class LoanTokenPoller extends LitElement {
   constructor() {
     super();
     this.identifier = '';
-    this.callback = () => {};
-    this.loanTokenPollingDelay = window.location.pathname === '/demo/' ? 2000 : 120000; // 120000 ms = 2 min
+    this.callback = () => {}; // callback function to be called after loan token is created
+    this.loanTokenPollingDelay =
+      window.location.pathname === '/demo/' ? 2000 : 120000; // 120000 ms = 2 min
     this.loanTokenInterval = undefined;
     this.localCache = new LocalCache();
   }
@@ -23,7 +24,7 @@ export class LoanTokenPoller extends LitElement {
   }
 
   async enableBookAccess(identifier, borrowType, callback) {
-    this.identifier = identifier
+    this.identifier = identifier;
     this.callback = callback;
     let consecutiveLoanCounts = 1;
 
@@ -52,7 +53,7 @@ export class LoanTokenPoller extends LitElement {
       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
@@ -72,39 +73,17 @@ export class LoanTokenPoller extends LitElement {
 
   async handleLoanTokenPoller() {
     const action = 'create_token';
-    // await new Promise(r => setTimeout(r, 3000));
-    console.log(this.callback)
     ActionsHandlerService({
       identifier: this.identifier,
       action,
       error: data => {
-        console.log('error', data);
-        this.handleLendingActionError({detail: { action, data }})
-        // this.dispatchActionError(action, data);
+        this.handleLendingActionError({ detail: { action, data } });
         clearInterval(this.loanTokenInterval); // stop token fetch api
         this.callback();
       },
       success: () => {
         this.callback();
-      }
+      },
     });
   }
-
-  /**
-   * 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

@@ -66,7 +66,6 @@ export default class IABookActions extends LoanTokenPoller {
   }
 
   updated(changed) {
-    // console.log(changed)
     if (changed.has('lendingStatus') || changed.has('bwbPurchaseUrl')) {
       this.setupLendingToolbarActions();
       this.update();
@@ -158,27 +157,32 @@ export default class IABookActions extends LoanTokenPoller {
       this.startBrowseTimer();
     }
 
-    console.log('this.borrowType', this.borrowType);
-
     /**
+     * enable access of borrowed/browsed books
+     *
      * this.lendingBarPostInit() callback function use to:-
      * - disptach lendingFlow::PostInit event
      * - initialize bookreader using br.init()
      */
-    if (this.borrowType) {
-      // enable access of borrowed/browsed books
-      this.enableBookAccess(this.identifier, this.borrowType, this.lendingBarPostInit);
-    } else {
-      this.lendingBarPostInit();
+    if (this.barType === 'action') {
+      this.enableBookAccess(
+        this.identifier,
+        this.borrowType,
+        this.lendingBarPostInit
+      );
     }
   }
 
   render() {
     if (this.barType === 'title') {
-      return html`<section class="lending-wrapper">${this.bookTitleBar}</section>`;
+      return html`<section class="lending-wrapper">
+        ${this.bookTitleBar}
+      </section>`;
     }
 
-    return html`<section class="lending-wrapper">${this.bookActionBar}</section>`;
+    return html`<section class="lending-wrapper">
+      ${this.bookActionBar}
+    </section>`;
   }
 
   get bookTitleBar() {
@@ -279,8 +283,7 @@ export default class IABookActions extends LoanTokenPoller {
       modalConfig.showCloseButton = false;
       modalConfig.message = html` Uh oh, something went wrong trying to access
         this book.<br />
-        Please <a href="${() => window.location.reload(true)}">refresh</a> to
-        try again or send us an email to
+        Please <a href="/">refresh</a> to try again or send us an email to
         <a
           href="mailto:info@archive.org?subject=Help: cannot access my borrowed book: ${this
             .identifier}"