@internetarchive/ia-book-actions 0.0.15-event1 → 0.0.16-2

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-event1",
+  "version": "0.0.16-2",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",

package/src/assets/data/lending-get-status-service.js

@@ -46,7 +46,7 @@ export const defaultLendingStatus = {
   isPrintDisabledOnly: false,
   loanCount: 0,
   loanRecord: [],
-  loansUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
+  returnUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
   maxLoans: 10,
   secondsLeftOnLoan: 10,
   shouldProtectImages: true,
@@ -116,7 +116,7 @@ export const canBrowseAndBorrow = {
     identifier: 'practicalorganic00plim',
   },
   loanStartDate: '2021-07-30 09:57:40',
-  loansUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
+  returnUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
   maxLoans: 10,
   secondsLeftOnLoan: 3591,
   shouldProtectImages: true,

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.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 = '';
@@ -167,7 +169,6 @@ export default class IABookActions extends LitElement {
     if (hasExpired) {
       this.tokenPoller?.disconnectedInterval();
       /** Global event - always fire */
-      console.log("BROWSE EXPIRED - DISPATCHING: ", events.browseExpired);
       this.dispatchEvent(
         new Event(events.browseExpired, {
           bubbles: true,
@@ -222,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');
+  });
 });