@internetarchive/ia-book-actions 0.0.6-5 → 0.0.6-6

package/package.json

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

package/src/assets/styles/collapsible-action-group.js

@@ -6,6 +6,9 @@ export default css`
     height: 3.5rem;
     padding: 1rem 0;
   }
+  .actiongroup {
+    display: flex;
+  }
   .action-buttons {
     display: inline-flex;
     align-items: center;

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

@@ -18,7 +18,7 @@ export default function ActionsHandlerService(options) {
 
   let baseHost = '';
   if (window.location.pathname === '/demo/') {
-    baseHost = `/demo/1`;
+    baseHost = `/demo/`;
   } else {
     baseHost = `/services/loans/loan`;
   }
@@ -35,8 +35,8 @@ export default function ActionsHandlerService(options) {
       // test changes, (won't affect you)
       if (baseHost == '/demo/1' || baseHost == '/demo/') {
         return {
-          error: 'This book is not available to browse at this time. Please try again later.',
-          // error: 'This book is not available to borrow at this time. Please try again later.',
+          error:
+            'This book is not available to borrow at this time. Please try again later.',
         };
       }
 

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

@@ -88,7 +88,7 @@ export default class ActionsHandler extends LitElement {
 
   handleBrowseIt() {
     const context = 'browse_book';
-    this.toggleActionBarState(context);
+    this.ActionError(context);
 
     ActionsHandlerService({
       action: context,
@@ -98,14 +98,14 @@ export default class ActionsHandler extends LitElement {
       },
       error: data => {
         alert(data.error);
-        this.toggleActionBarState(context, data);
+        this.ActionError(context, data);
       },
     });
   }
 
   handleReturnIt() {
     const context = 'return_loan';
-    this.toggleActionBarState(context);
+    this.ActionError(context);
 
     ActionsHandlerService({
       action: context,
@@ -116,14 +116,14 @@ export default class ActionsHandler extends LitElement {
       },
       error: data => {
         alert(data.error);
-        this.toggleActionBarState(context);
+        this.ActionError(context);
       },
     });
   }
 
   handleBorrowIt() {
     const context = 'borrow_book';
-    this.toggleActionBarState(context);
+    this.ActionError(context);
 
     ActionsHandlerService({
       action: context,
@@ -133,14 +133,14 @@ export default class ActionsHandler extends LitElement {
       },
       error: data => {
         alert(data.error);
-        this.toggleActionBarState(context, data);
+        this.ActionError(context, data);
       },
     });
   }
 
   handleReserveIt() {
     const context = 'join_waitlist';
-    this.toggleActionBarState(context);
+    this.ActionError(context);
 
     ActionsHandlerService({
       action: context,
@@ -150,14 +150,14 @@ export default class ActionsHandler extends LitElement {
       },
       error: data => {
         alert(data.error);
-        this.toggleActionBarState(context);
+        this.ActionError(context);
       },
     });
   }
 
   handleRemoveFromWaitingList() {
     const context = 'leave_waitlist';
-    this.toggleActionBarState(context);
+    this.ActionError(context);
 
     ActionsHandlerService({
       action: context,
@@ -167,7 +167,7 @@ export default class ActionsHandler extends LitElement {
       },
       error: data => {
         alert(data.error);
-        this.toggleActionBarState(context);
+        this.ActionError(context);
       },
     });
   }
@@ -183,9 +183,6 @@ export default class ActionsHandler extends LitElement {
   handleReadItNow(extraParam) {
     const currentParams = new URLSearchParams(window.location.search);
 
-    // Delete the ?q= parameter just after borrow a book. see: WEBDEV-3979
-    currentParams.delete('q');
-
     if (extraParam) {
       // append extraParam key-value in currentParams
       const extraParams = new URLSearchParams(extraParam);
@@ -222,9 +219,9 @@ export default class ActionsHandler extends LitElement {
     document.cookie = cookie;
   }
 
-  toggleActionBarState(context, data = {}) {
+  ActionError(context, data = {}) {
     this.dispatchEvent(
-      new CustomEvent('toggle-action-bar-state', {
+      new CustomEvent('lendingActionError', {
         detail: { context, data },
       })
     );

package/src/ia-book-actions.js

@@ -175,27 +175,35 @@ export default class IABookActions extends LitElement {
         .width=${this.width}
         .hasAdminAccess=${this.hasAdminAccess}
         .disabled=${this.disable}
-        @toggle-action-bar-state=${this.toggleActionBarState}
+        @lendingActionError=${this.handleLendingActionError}
       >
       </collapsible-action-group>
       ${this.textGroupTemplate} ${this.infoIconTemplate}
     `;
   }
 
-  toggleActionBarState(e) {
+  handleLendingActionError(e) {
     // toggle activity loader
     this.disable = !this.disable;
 
-    // update action bar states is book is not available to browse or borrow.
-    if (e?.detail?.data?.error) {
-      const errorMsg = e.detail.data.error;
-      if (errorMsg.match(/not available to browse/gm)) {
-        const currStatus = {...this.lendingStatus, available_to_browse: false };
-        this.lendingStatus = currStatus;
-      } else if (errorMsg.match(/not available to borrow/gm)) {
-        const currStatus = { ...this.lendingStatus, available_to_borrow: false };
-        this.lendingStatus = currStatus;
+    const context = e?.detail?.context;
+    const errorMsg = e?.detail?.data?.error;
+
+    // update action bar state if book is not available to browse or borrow.
+    if (errorMsg && errorMsg.match(/not available to borrow/gm)) {
+      let currStatus = this.lendingStatus;
+      if (context === 'browse_book') {
+        currStatus = {
+          ...this.lendingStatus,
+          available_to_browse: false,
+        };
+      } else if (context === 'borrow_book') {
+        currStatus = {
+          ...this.lendingStatus,
+          available_to_borrow: false,
+        };
       }
+      this.lendingStatus = currStatus;
     }
   }
 

package/test/ia-book-actions.test.js

@@ -106,6 +106,65 @@ describe('Primary Actions data', () => {
 });
 
 describe('Borrow status actions', () => {
+  it('Update available_to_browse key when book is not available to borrow', async () => {
+    const el = await fixture(
+      container({
+        userid: '@user1',
+        lendingStatus: {
+          is_lendable: true,
+          available_to_browse: true,
+          available_to_borrow: true,
+        },
+      })
+    );
+
+    const errorEvent = new CustomEvent('lendingActionError');
+    el.addEventListener('lendingActionError', () => {
+      el.handleLendingActionError({
+        detail: {
+          context: 'browse_book',
+          data: { error: 'not available to borrow' },
+        },
+      });
+    });
+    el.dispatchEvent(errorEvent);
+    await el.updateComplete;
+
+    console.log(el.lendingStatus);
+    // removed available_to_browse from lending bar
+    expect(el.lendingStatus.available_to_browse).to.be.false;
+    expect(el.primaryActions[0].text).to.equal('Borrow for 14 days');
+  });
+
+  it('Update available_to_borrow key when book is not available to borrow', async () => {
+    const el = await fixture(
+      container({
+        userid: '@user1',
+        lendingStatus: {
+          is_lendable: true,
+          available_to_browse: true,
+          available_to_borrow: true,
+        },
+      })
+    );
+
+    const errorEvent = new Event('lendingActionError');
+    el.addEventListener('lendingActionError', () => {
+      el.handleLendingActionError({
+        detail: {
+          context: 'borrow_book',
+          data: { error: 'not available to borrow' },
+        },
+      });
+    });
+    el.dispatchEvent(errorEvent);
+    await el.updateComplete;
+
+    // removed available_to_borrow from lending bar
+    expect(el.lendingStatus.available_to_borrow).to.be.false;
+    expect(el.primaryActions[0].text).to.equal('Borrow for 1 hour');
+  });
+
   it('Check action for borrowable book without user', async () => {
     const el = await fixture(
       container({