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

package/demo/index.html

@@ -96,7 +96,7 @@
     iaBookActions.userid = '';
     iaBookActions.identifier = identifier;
     iaBookActions.bookTitle = 'Contemporary Black biography. Volume 39 : profiles from the interContemporary Black biography. Volume 39';
-    iaBookActions.lendingStatus = defaultLendingStatus;
+    iaBookActions.lendingStatus = canBrowseAndBorrow;
     iaBookActions.bwbPurchaseUrl = '';
     iaBookActions.barType = '';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.6-2",
+  "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`;
   }
@@ -30,12 +30,27 @@ export default function ActionsHandlerService(options) {
   fetch(baseHost, {
     method: 'POST',
     body: formData,
-  }).then(response => {
-    if (response.status === 200) {
-      option?.success(response);
-    } else {
-      option?.error(response);
-    }
-    return;
-  });
+  })
+    .then(response => {
+      // test changes, (won't affect you)
+      if (baseHost == '/demo/1' || baseHost == '/demo/') {
+        return {
+          error:
+            'This book is not available to borrow at this time. Please try again later.',
+        };
+      }
+
+      // 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.
+      console.log('actual reponse for endpoint', data);
+      if (!data.error) {
+        option?.success(data);
+      } else {
+        option?.error(data);
+      }
+    });
 }

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

@@ -7,10 +7,7 @@ import ActionsHandlerService from './actions-handler-service.js';
  *
  * ActionsHandlerService is a function being used to execute
  * APIs based of the request made by user. It consist some parameters are as follows:-
- * 1. action: action name like browse_book, return_book, borrow_book etc...
- * 2. identifier: book name.
- * 3. success: This is callback function which will be executed after the API request
- *    return reponse as a success.
+ * 1. identifier: book name.
  */
 
 export default class ActionsHandler extends LitElement {
@@ -91,7 +88,7 @@ export default class ActionsHandler extends LitElement {
 
   handleBrowseIt() {
     const context = 'browse_book';
-    this.toggleLoader(context);
+    this.ActionError(context);
 
     ActionsHandlerService({
       action: context,
@@ -99,17 +96,16 @@ export default class ActionsHandler extends LitElement {
       success: () => {
         this.handleReadItNow();
       },
-      error: response => {
-        console.log(response);
-        alert(JSON.stringify(response.error));
-        this.toggleLoader(context);
+      error: data => {
+        alert(data.error);
+        this.ActionError(context, data);
       },
     });
   }
 
   handleReturnIt() {
     const context = 'return_loan';
-    this.toggleLoader(context);
+    this.ActionError(context);
 
     ActionsHandlerService({
       action: context,
@@ -118,17 +114,16 @@ export default class ActionsHandler extends LitElement {
         this.deleteLoanCookies();
         URLHelper.goToUrl(`/details/${this.identifier}`, true);
       },
-      error: response => {
-        console.log(response);
-        alert(JSON.stringify(response.error));
-        this.toggleLoader(context);
+      error: data => {
+        alert(data.error);
+        this.ActionError(context);
       },
     });
   }
 
   handleBorrowIt() {
     const context = 'borrow_book';
-    this.toggleLoader(context);
+    this.ActionError(context);
 
     ActionsHandlerService({
       action: context,
@@ -136,17 +131,16 @@ export default class ActionsHandler extends LitElement {
       success: () => {
         this.handleReadItNow();
       },
-      error: response => {
-        console.log(response);
-        alert(JSON.stringify(response.error));
-        this.toggleLoader(context);
+      error: data => {
+        alert(data.error);
+        this.ActionError(context, data);
       },
     });
   }
 
   handleReserveIt() {
     const context = 'join_waitlist';
-    this.toggleLoader(context);
+    this.ActionError(context);
 
     ActionsHandlerService({
       action: context,
@@ -154,17 +148,16 @@ export default class ActionsHandler extends LitElement {
       success: () => {
         URLHelper.goToUrl(URLHelper.getRedirectUrl(), true);
       },
-      error: response => {
-        console.log(response);
-        alert(JSON.stringify(response.error));
-        this.toggleLoader(context);
+      error: data => {
+        alert(data.error);
+        this.ActionError(context);
       },
     });
   }
 
   handleRemoveFromWaitingList() {
     const context = 'leave_waitlist';
-    this.toggleLoader(context);
+    this.ActionError(context);
 
     ActionsHandlerService({
       action: context,
@@ -172,10 +165,9 @@ export default class ActionsHandler extends LitElement {
       success: () => {
         URLHelper.goToUrl(URLHelper.getRedirectUrl(), true);
       },
-      error: response => {
-        console.log(response);
-        alert(JSON.stringify(response.error));
-        this.toggleLoader(context);
+      error: data => {
+        alert(data.error);
+        this.ActionError(context);
       },
     });
   }
@@ -191,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);
@@ -230,10 +219,10 @@ export default class ActionsHandler extends LitElement {
     document.cookie = cookie;
   }
 
-  toggleLoader(context) {
+  ActionError(context, data = {}) {
     this.dispatchEvent(
-      new CustomEvent('toggle-loader', {
-        detail: context,
+      new CustomEvent('lendingActionError', {
+        detail: { context, data },
       })
     );
   }

package/src/ia-book-actions.js

@@ -175,23 +175,36 @@ export default class IABookActions extends LitElement {
         .width=${this.width}
         .hasAdminAccess=${this.hasAdminAccess}
         .disabled=${this.disable}
-        @toggle-loader=${this.toggleLoader}
+        @lendingActionError=${this.handleLendingActionError}
       >
       </collapsible-action-group>
       ${this.textGroupTemplate} ${this.infoIconTemplate}
     `;
   }
 
-  toggleLoader(e) {
-    // if activity loader is disabled and action is browse or borrow,
-    // just change the lendingStatus to dynamic update action buttons
-    if (this.disable && ['browse_book', 'borrow_book'].includes(e.detail)) {
-      console.log('lendingStatus is changed to redraw action-buttons');
-      const currStatus = { ...this.lendingStatus, available_to_browse: false };
+  handleLendingActionError(e) {
+    // toggle activity loader
+    this.disable = !this.disable;
+
+    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;
     }
-
-    this.disable = !this.disable;
   }
 
   get iconClass() {

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({