@internetarchive/ia-book-actions 0.0.15 → 0.0.16-3

package/demo/index.html

@@ -119,6 +119,7 @@
     iaBookActions.modalConfig = modalConfig;
     iaBookActions.lendingBarPostInit = lendingBarPostInit;
     iaBookActions.tokenDelay = 2000; // 2 seconds
+    iaBookActions.returnUrl = 'https://openlibrary.org';
 
     let lendingStatus1 = iaBookActions.lendingStatus;
 

package/package.json

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

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

@@ -27,6 +27,7 @@ export class CollapsibleActionGroup extends ActionsHandler {
       hasAdminAccess: { type: Boolean },
       dropdownArrow: { type: String },
       disabled: { type: Boolean },
+      returnUrl: { type: String },
     };
   }
 
@@ -45,6 +46,7 @@ export class CollapsibleActionGroup extends ActionsHandler {
     this.title = '';
     this.loaderIcon = 'https://archive.org/upload/images/tree/loading.gif';
     this.disabled = false;
+    this.returnUrl = '';
   }
 
   updated(changed) {

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

@@ -4,7 +4,7 @@
  * Helper to call loan service
  * @param {Object} options
  */
-export default function ActionsHandlerService(options) {
+export default async function ActionsHandlerService(options) {
   const option = {
     action: null,
     identifier: '',
@@ -16,7 +16,11 @@ export default function ActionsHandlerService(options) {
   let baseHost = '/services/loans/loan';
   const location = window?.location;
 
-  // return intentional error on dev environment
+  // return error reponse when not production and has ?error=true param...
+  const tokenError = 'loan token not found. please try again later.';
+  const borrowError =
+    'This book is not available to borrow at this time. Please try again later.';
+  const erroneousActions = ['browse_book', 'borrow_book', 'create_token'];
   const shouldReturnError =
     location?.href?.indexOf('?error=true') !== -1 &&
     location?.hostname !== 'archive.org';
@@ -26,43 +30,39 @@ export default function ActionsHandlerService(options) {
   let formData = new FormData();
   formData.append('action', option.action);
   formData.append('identifier', option.identifier);
+  try {
+    await fetch(baseHost, {
+      method: 'POST',
+      body: formData,
+    })
+      .then(response => {
+        // intentional error on localhost
+        if (shouldReturnError && erroneousActions.includes(option?.action)) {
+          return {
+            success: false,
+            error: option?.action === 'create_token' ? tokenError : borrowError,
+          };
+        }
 
-  fetch(baseHost, {
-    method: 'POST',
-    body: formData,
-  })
-    .then(response => {
-      const tokenError = 'loan token not found. please try again later.';
-      const borrowError =
-        'This book is not available to borrow at this time. Please try again later.';
-
-      // return error reponse when not production and has ?error=true param...
-      const erroneousActions = ['browse_book', 'borrow_book', 'create_token'];
-      if (shouldReturnError && erroneousActions.includes(option?.action)) {
-        return {
-          success: false,
-          error: option?.action === 'create_token' ? tokenError : borrowError,
-        };
-      }
-
-      // return success response for /demo/ server...
-      if (baseHost == '/demo/1' || baseHost == '/demo/') {
-        return {
-          success: true,
-          message: 'operation executed successfully!',
-        };
-      }
+        // return success response for /demo/ server...
+        if (baseHost == '/demo/1' || baseHost == '/demo/') {
+          return {
+            success: true,
+            message: 'operation executed successfully!',
+          };
+        }
 
-      // The response is a Response instance.
-      // You parse the data into a useable format using `.json()`
-      return response.json();
-    })
-    .then(data => {
-      // `data` is the parsed version of the JSON returned from the above endpoint.
-      if (!data?.error) {
-        option?.success(data);
-      } else {
-        option?.error(data);
-      }
-    });
+        // The response is a Response instance.
+        // You parse the data into a useable format using `.json()`
+        return response.json();
+      })
+      .then(data => {
+        // `data` is the parsed version of the JSON returned from the above endpoint.
+        if (!data?.error) {
+          option?.success(data);
+        } else {
+          option?.error(data);
+        }
+      });
+  } catch (err) {}
 }

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

@@ -13,11 +13,18 @@ import * as Cookies from '../doc-cookies.js';
  */
 
 export default class ActionsHandler extends LitElement {
+  static properties() {
+    return {
+      returnUrl: { type: String },
+    };
+  }
+
   constructor(identifier) {
     super();
     this.identifier = identifier;
     this.ajaxTimeout = 6000;
     this.bindEvents();
+    this.returnUrl = '';
   }
 
   sendEvent(eventCategory, eventAction) {
@@ -121,7 +128,7 @@ export default class ActionsHandler extends LitElement {
       identifier: this.identifier,
       success: () => {
         this.deleteLoanCookies();
-        URLHelper.goToUrl(`/details/${this.identifier}`, true);
+        URLHelper.goToUrl(this.returnUrl, true);
       },
       error: data => {
         this.dispatchActionError(action, data);

package/src/ia-book-actions.js

@@ -24,6 +24,7 @@ export default class IABookActions extends LitElement {
       identifier: { type: String },
       bookTitle: { type: String },
       lendingStatus: { type: Object },
+      returnUrl: { type: String },
       width: { type: Number },
       bwbPurchaseUrl: { type: String },
       lendingBarPostInit: {
@@ -43,6 +44,7 @@ export default class IABookActions extends LitElement {
     this.userid = '';
     this.identifier = '';
     this.bookTitle = '';
+    this.returnUrl = '';
     this.lendingStatus = {};
     this.width = 0;
     this.bwbPurchaseUrl = '';
@@ -221,6 +223,7 @@ export default class IABookActions extends LitElement {
         .secondaryActions=${this.secondaryActions}
         .width=${this.width}
         .borrowType=${this.borrowType}
+        .returnUrl=${this.returnUrl}
         ?hasAdminAccess=${this.hasAdminAccess}
         ?disabled=${this.disableActionGroup}
         @lendingActionError=${this.handleLendingActionError}

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

@@ -29,6 +29,7 @@ const container = ({
     .primaryActions=${primaryActions}
     .secondaryActions=${secondaryActions}
     .borrowType=${borrowType}
+    .returnUrl=${'https://openlibrary.org'}
   ></collapsible-action-group>`;
 
 describe('<collapsible-action-group>', () => {
@@ -83,4 +84,8 @@ describe('<collapsible-action-group>', () => {
     expect(eAnalytics.category).to.equal('Lending');
     expect(eAnalytics.action).to.equal('Browse');
   });
+  it('receives `loanUrl`', async () => {
+    const el = await fixture(container());
+    expect(el.returnUrl).to.equal('https://openlibrary.org');
+  });
 });