@internetarchive/ia-book-actions 0.0.5-0 → 0.0.5-4

package/demo/index.html

@@ -83,12 +83,7 @@
     import '../src/ia-book-actions.js';
     import {
       defaultLendingStatus,
-      canBrowse,
-      browsed,
       canBrowseAndBorrow,
-      browsedAndBorrow,
-      canBrowseAndBorrowod,
-      canBrowseAndJoinWaitlistForBorrow,
     } from '../src/assets/data/lending-get-status-service.js';
 
     const userid = '@neeraj-archive';
@@ -100,62 +95,64 @@
     // set defaultLendingStatus for unavailable (without borrowables) book
     iaBookActions.userid = '';
     iaBookActions.identifier = identifier;
-    iaBookActions.lendingStatus = canBrowseAndBorrow;
-    iaBookActions.bwbPurchaseUrl = 'sdf';
+    iaBookActions.lendingStatus = defaultLendingStatus;
+    iaBookActions.bwbPurchaseUrl = '';
+
+    let lendingStatus1 = iaBookActions.lendingStatus;
 
     document.querySelectorAll('.userState input[type=checkbox]').forEach((item) => {
       item.addEventListener('click', (e) => {
-        let lendingStatus1 = defaultLendingStatus;
         if (e.target.checked) {
           if (e.target.value === 'isAdmin') lendingStatus1.isAdmin = true;
           if (e.target.value === 'isLoggedIn') iaBookActions.userid = '@neeraj';
-        }
-        if (e.target.checked === false) {
+        } else {
           if (e.target.value === 'isAdmin') lendingStatus1.isAdmin = false;
           if (e.target.value === 'isLoggedIn') iaBookActions.userid = '';
         }
-          iaBookActions.lendingStatus = lendingStatus1;
+        let lending = {...defaultLendingStatus, ...lendingStatus1};
+        iaBookActions.lendingStatus = lending;
       });
     });
 
-
     document.querySelectorAll('.printDisabled input[type=checkbox]').forEach((item) => {
-      const is_printdisabled = false;
-      const user_is_printdisabled = false;
       item.addEventListener('click', (e) => {
-        let lendingStatus1 = defaultLendingStatus;
-        if (e.target.value === 'is_printdisabled') {
-          lendingStatus1.is_printdisabled = true;
-        }
-        if (e.target.value === 'user_is_printdisabled') {
-          lendingStatus1.user_is_printdisabled = true;
+        if (e.target.checked) {
+          if (e.target.value === 'is_printdisabled') lendingStatus1.is_printdisabled = true;
+          if (e.target.value === 'user_is_printdisabled') lendingStatus1.user_is_printdisabled = true;
+        } else {
+          if (e.target.value === 'is_printdisabled') lendingStatus1.is_printdisabled = false;
+          if (e.target.value === 'user_is_printdisabled') lendingStatus1.user_is_printdisabled = false;
         }
 
-        if (lendingStatus1.user_is_printdisabled && lendingStatus1.is_printdisabled) {
-          iaBookActions.lendingStatus = lendingStatus1;
-        }
+        let lending = {...defaultLendingStatus, ...lendingStatus1};
+        iaBookActions.lendingStatus = lending;
       });
     });
 
     document.querySelectorAll('.availableToBrowse input[type=radio]').forEach((item) => {
       item.addEventListener('click', (e) => {
-        let lendingStatus1 = defaultLendingStatus;
-
         if (e.target.value === 'user_has_browsed') {
           lendingStatus1.user_has_browsed = true;
           lendingStatus1.available_to_browse = false;
+          lendingStatus1.secondsLeftOnLoan = 10;
+          lendingStatus1.browsingExpired = false;
+        } else if(e.target.value === 'browsingExpired') {
+          lendingStatus1.user_has_browsed = true;
+          lendingStatus1.available_to_browse = false;
+          lendingStatus1.secondsLeftOnLoan = 0;
+          lendingStatus1.browsingExpired = true;
         } else if (e.target.value === 'available_to_browse') {
           lendingStatus1.available_to_browse = true;
           lendingStatus1.user_has_browsed = false;
         }
-        iaBookActions.lendingStatus = lendingStatus1;
+
+        let lending = {...defaultLendingStatus, ...lendingStatus1};
+        iaBookActions.lendingStatus = lending;
       });
     });
 
     document.querySelectorAll('.availableToBorrow input[type=radio]').forEach((item) => {
       item.addEventListener('click', (e) => {
-        let lendingStatus1 = defaultLendingStatus;
-
         if (e.target.value === 'available_to_borrow') {
           lendingStatus1.available_to_borrow = true;
           lendingStatus1.user_on_waitlist = false;
@@ -178,7 +175,8 @@
           lendingStatus1.user_has_borrowed = true;
         }
 
-        iaBookActions.lendingStatus = lendingStatus1;
+        let lending = {...defaultLendingStatus, ...lendingStatus1};
+        iaBookActions.lendingStatus = lending;
       });
     });
 
@@ -210,6 +208,7 @@
             <td class="availableToBrowse">
               <label><input type="radio" name="browse" value="available_to_browse" />available_to_browse</label>
               <label><input type="radio" name="browse" value="user_has_browsed" />user_has_browsed</label>
+              <label><input type="radio" name="browse" value="browsingExpired" />browsingExpired</label>
             </td>
             <td class="availableToBorrow">
               <label><input type="radio" name="borrow" value="available_to_borrow" />available_to_borrow</label>
@@ -218,7 +217,7 @@
               <label><input type="radio" name="borrow" value="user_has_borrowed" />user_has_borrowed</label>
             </td>
             <td class="purchase">
-              <label><input type="checkbox" name="purchase" value="purchase" />purchase (Click to reflect selection)</label>
+              <label><input type="checkbox" name="purchase" value="purchase" />purchase</label>
             </td>
 
             <td class="reflect">
@@ -229,30 +228,6 @@
             </td>
           </tr>
         </table>
-
-        <table class="mode" style="display: none;">
-        <tr>
-          <td>
-            <label><input type="radio" name="contact" value="canBrowse" />CanBrowse</label>
-          </td>
-          <td>
-            <label><input type="radio" name="contact" value="browsed" />browsed</label>
-          </td>
-          <td>
-            <label><input type="radio" name="contact" value="canBrowseAndBorrow" />canBrowseAndBorrow</label>
-          </td>
-          <td>
-            <label><input type="radio" name="contact" value="browsedAndBorrow" />browsedAndBorrow</label>
-          </td>
-          <td>
-            <label><input type="radio" name="contact" value="canBrowseAndBorrowod" />canBrowseAndBorrowod</label>
-          </td>
-          <td>
-            <label><input type="radio" name="contact"
-              id="canBrowseAndJoinWaitlistForBorrow" value="canBrowseAndJoinWaitlistForBorrow" />canBrowseAndJoinWaitlistForBorrow</label>
-          </td>
-        </tr>
-        </table>
     </fieldset>
   </div>
 </body>

package/package.json

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

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

@@ -34,6 +34,7 @@ export const defaultLendingStatus = {
   users_on_waitlist: 0,
   // userid: "",
   bookUrl: '/details/practicalorganic00plim',
+  browsingExpired: false,
   daysLeftOnLoan: 0,
   isAdmin: false,
   isArchiveOrgLending: true,
@@ -47,7 +48,7 @@ export const defaultLendingStatus = {
   loanRecord: [],
   loansUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
   maxLoans: 10,
-  secondsLeftOnLoan: 0,
+  secondsLeftOnLoan: 10,
   shouldProtectImages: true,
   totalWaitlistCount: 0,
   userHasBorrowed: false,
@@ -58,139 +59,6 @@ export const defaultLendingStatus = {
   userWaitlistPosition: -1,
   userid: '@neeraj-archive',
 };
-
-export const canBrowse = {
-  active_borrows: 0,
-  active_browses: 0,
-  available_borrowable_copies: 0,
-  available_browsable_copies: 1,
-  available_lendable_copies: 1,
-  available_to_borrow: false,
-  available_to_browse: true,
-  available_to_waitlist: false,
-  copies_reserved_for_waitlist: 0,
-  is_lendable: true,
-  is_login_required: false,
-  is_printdisabled: true,
-  is_readable: false,
-  last_borrow: null,
-  last_browse: null,
-  last_waitlist: null,
-  max_borrowable_copies: 0,
-  max_browsable_copies: 1,
-  max_lendable_copies: 1,
-  next_borrow_expiration: null,
-  next_browse_expiration: null,
-  orphaned_acs_loans: 0,
-  upgradable_browses: 0,
-  user_at_max_loans: false,
-  user_can_claim_waitlist: false,
-  user_has_acs_borrowed: false,
-  user_has_borrowed: false,
-  user_has_browsed: false,
-  user_is_printdisabled: false,
-  user_loan_count: 0,
-  user_loan_record: [],
-  user_on_waitlist: false,
-  users_on_waitlist: 0,
-  // userid: "",
-  bookUrl: '/details/practicalorganic00plim',
-  daysLeftOnLoan: 0,
-  isAdmin: false,
-  isArchiveOrgLending: true,
-  isAvailable: false,
-  isAvailableForBrowsing: true,
-  isBrowserBorrowable: true,
-  isLendingRequired: true,
-  isOpenLibraryLending: false,
-  isPrintDisabledOnly: false,
-  loanCount: 0,
-  loanRecord: [],
-  loansUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
-  maxLoans: 10,
-  secondsLeftOnLoan: 0,
-  shouldProtectImages: true,
-  totalWaitlistCount: 0,
-  userHasBorrowed: false,
-  userHasBrowsed: false,
-  userHoldIsReady: false,
-  userIsPrintDisabled: false,
-  userOnWaitingList: false,
-  userWaitlistPosition: -1,
-  userid: '@neeraj-archive',
-};
-
-export const browsed = {
-  active_borrows: 0,
-  active_browses: 1,
-  available_borrowable_copies: 0,
-  available_browsable_copies: 0,
-  available_lendable_copies: 0,
-  available_to_borrow: false,
-  available_to_browse: false,
-  available_to_waitlist: false,
-  copies_reserved_for_waitlist: 0,
-  is_lendable: true,
-  is_login_required: false,
-  is_printdisabled: true,
-  is_readable: false,
-  last_borrow: null,
-  last_browse: '2021-07-30 09:57:40',
-  last_waitlist: null,
-  max_borrowable_copies: 0,
-  max_browsable_copies: 1,
-  max_lendable_copies: 1,
-  next_borrow_expiration: null,
-  next_browse_expiration: '2021-07-30 10:57:40',
-  orphaned_acs_loans: 0,
-  upgradable_browses: 0,
-  user_at_max_loans: false,
-  user_can_claim_waitlist: false,
-  user_has_acs_borrowed: false,
-  user_has_borrowed: false,
-  user_has_browsed: true,
-  user_is_printdisabled: false,
-  user_loan_count: 1,
-  user_loan_record: {
-    userid: '@neeraj-archive',
-    listname: 'loan',
-    identifier: 'practicalorganic00plim',
-  },
-  user_on_waitlist: false,
-  users_on_waitlist: 0,
-  // userid: "",
-  bookUrl: '/details/practicalorganic00plim',
-  daysLeftOnLoan: 0,
-  isAdmin: false,
-  isArchiveOrgLending: true,
-  isAvailable: false,
-  isAvailableForBrowsing: false,
-  isBrowserBorrowable: true,
-  isLendingRequired: true,
-  isOpenLibraryLending: false,
-  isPrintDisabledOnly: false,
-  loanCount: 1,
-  loanId: '1ca15f92d07dfdae3f7b1516084aec5d603800b8',
-  loanRecord: {
-    userid: '@neeraj-archive',
-    listname: 'loan',
-    identifier: 'practicalorganic00plim',
-  },
-  loanStartDate: '2021-07-30 09:57:40',
-  loansUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
-  maxLoans: 10,
-  secondsLeftOnLoan: 3591,
-  shouldProtectImages: true,
-  totalWaitlistCount: 0,
-  userHasBorrowed: false,
-  userHasBrowsed: true,
-  userHoldIsReady: false,
-  userIsPrintDisabled: false,
-  userOnWaitingList: false,
-  userWaitlistPosition: -1,
-  userid: '@neeraj-archive',
-};
-
 export const canBrowseAndBorrow = {
   active_borrows: 0,
   active_browses: 1,
@@ -261,206 +129,3 @@ export const canBrowseAndBorrow = {
   userWaitlistPosition: -1,
   userid: '@neeraj-archive',
 };
-
-export const browsedAndBorrow = {
-  active_borrows: 0,
-  active_browses: 1,
-  available_borrowable_copies: 0,
-  available_browsable_copies: 0,
-  available_lendable_copies: 0,
-  available_to_borrow: true,
-  available_to_browse: true,
-  available_to_waitlist: false,
-  copies_reserved_for_waitlist: 0,
-  is_lendable: true,
-  is_login_required: false,
-  is_printdisabled: true,
-  is_readable: false,
-  last_borrow: null,
-  last_browse: '2021-07-30 09:57:40',
-  last_waitlist: null,
-  max_borrowable_copies: 0,
-  max_browsable_copies: 1,
-  max_lendable_copies: 1,
-  next_borrow_expiration: null,
-  next_browse_expiration: '2021-07-30 10:57:40',
-  orphaned_acs_loans: 0,
-  upgradable_browses: 0,
-  user_at_max_loans: false,
-  user_can_claim_waitlist: false,
-  user_has_acs_borrowed: false,
-  user_has_borrowed: false,
-  user_has_browsed: true,
-  user_is_printdisabled: false,
-  user_loan_count: 1,
-  user_loan_record: {
-    userid: '@neeraj-archive',
-    listname: 'loan',
-    identifier: 'practicalorganic00plim',
-  },
-  user_on_waitlist: false,
-  users_on_waitlist: 0,
-  // userid: "",
-  bookUrl: '/details/practicalorganic00plim',
-  daysLeftOnLoan: 0,
-  isAdmin: false,
-  isArchiveOrgLending: true,
-  isAvailable: false,
-  isAvailableForBrowsing: false,
-  isBrowserBorrowable: true,
-  isLendingRequired: true,
-  isOpenLibraryLending: false,
-  isPrintDisabledOnly: false,
-  loanCount: 1,
-  loanId: '1ca15f92d07dfdae3f7b1516084aec5d603800b8',
-  loanRecord: {
-    userid: '@neeraj-archive',
-    listname: 'loan',
-    identifier: 'practicalorganic00plim',
-  },
-  loanStartDate: '2021-07-30 09:57:40',
-  loansUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
-  maxLoans: 10,
-  secondsLeftOnLoan: 3591,
-  shouldProtectImages: true,
-  totalWaitlistCount: 0,
-  userHasBorrowed: false,
-  userHasBrowsed: true,
-  userHoldIsReady: false,
-  userIsPrintDisabled: false,
-  userOnWaitingList: false,
-  userWaitlistPosition: -1,
-  userid: '@neeraj-archive',
-};
-
-export const canBrowseAndBorrowod = {
-  active_borrows: 0,
-  active_browses: 1,
-  available_borrowable_copies: 0,
-  available_browsable_copies: 0,
-  available_lendable_copies: 0,
-  available_to_borrow: true,
-  available_to_browse: true,
-  available_to_waitlist: false,
-  copies_reserved_for_waitlist: 0,
-  is_lendable: true,
-  is_login_required: false,
-  is_printdisabled: true,
-  is_readable: false,
-  last_borrow: null,
-  last_browse: '2021-07-30 09:57:40',
-  last_waitlist: null,
-  max_borrowable_copies: 0,
-  max_browsable_copies: 1,
-  max_lendable_copies: 1,
-  next_borrow_expiration: null,
-  next_browse_expiration: '2021-07-30 10:57:40',
-  orphaned_acs_loans: 0,
-  upgradable_browses: 0,
-  user_at_max_loans: false,
-  user_can_claim_waitlist: false,
-  user_has_acs_borrowed: false,
-  user_has_borrowed: true,
-  user_has_browsed: false,
-  user_is_printdisabled: false,
-  user_loan_count: 1,
-  user_loan_record: {
-    userid: '@neeraj-archive',
-    listname: 'loan',
-    identifier: 'practicalorganic00plim',
-  },
-  user_on_waitlist: false,
-  users_on_waitlist: 0,
-  // userid: "",
-  bookUrl: '/details/practicalorganic00plim',
-  daysLeftOnLoan: 0,
-  isAdmin: false,
-  isArchiveOrgLending: true,
-  isAvailable: false,
-  isAvailableForBrowsing: false,
-  isBrowserBorrowable: true,
-  isLendingRequired: true,
-  isOpenLibraryLending: false,
-  isPrintDisabledOnly: false,
-  loanCount: 1,
-  loanId: '1ca15f92d07dfdae3f7b1516084aec5d603800b8',
-  loanRecord: {
-    userid: '@neeraj-archive',
-    listname: 'loan',
-    identifier: 'practicalorganic00plim',
-  },
-  loanStartDate: '2021-07-30 09:57:40',
-  loansUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
-  maxLoans: 10,
-  secondsLeftOnLoan: 3591,
-  shouldProtectImages: true,
-  totalWaitlistCount: 0,
-  userHasBorrowed: false,
-  userHasBrowsed: true,
-  userHoldIsReady: false,
-  userIsPrintDisabled: false,
-  userOnWaitingList: false,
-  userWaitlistPosition: -1,
-  userid: '@neeraj-archive',
-};
-
-export const canBrowseAndJoinWaitlistForBorrow = {
-  active_borrows: 1,
-  active_browses: 0,
-  available_borrowable_copies: 0,
-  available_browsable_copies: 1,
-  available_lendable_copies: 1,
-  available_to_borrow: false,
-  available_to_browse: true,
-  available_to_waitlist: true,
-  copies_reserved_for_waitlist: 0,
-  is_lendable: true,
-  is_login_required: false,
-  is_printdisabled: true,
-  is_readable: false,
-  last_borrow: '2021-07-24 18:17:46',
-  last_browse: null,
-  last_waitlist: '2021-07-27 11:03:23',
-  max_borrowable_copies: 1,
-  max_browsable_copies: 2,
-  max_lendable_copies: 2,
-  next_borrow_expiration: '2021-08-02 18:29:41',
-  next_browse_expiration: null,
-  orphaned_acs_loans: 0,
-  upgradable_browses: 0,
-  user_at_max_loans: false,
-  user_can_claim_waitlist: false,
-  user_has_acs_borrowed: false,
-  user_has_borrowed: false,
-  user_has_browsed: false,
-  user_is_printdisabled: false,
-  user_loan_count: 0,
-  user_loan_record: [],
-  user_on_waitlist: false,
-  users_on_waitlist: 2,
-  // userid: "",
-  bookUrl: '/details/worldletitutio0000vish',
-  daysLeftOnLoan: 0,
-  isAdmin: false,
-  isArchiveOrgLending: true,
-  isAvailable: false,
-  isAvailableForBrowsing: true,
-  isBrowserBorrowable: true,
-  isLendingRequired: true,
-  isOpenLibraryLending: false,
-  isPrintDisabledOnly: false,
-  loanCount: 0,
-  loanRecord: [],
-  loansUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
-  maxLoans: 10,
-  secondsLeftOnLoan: 0,
-  shouldProtectImages: true,
-  totalWaitlistCount: 2,
-  userHasBorrowed: false,
-  userHasBrowsed: false,
-  userHoldIsReady: false,
-  userIsPrintDisabled: false,
-  userOnWaitingList: false,
-  userWaitlistPosition: -1,
-  userid: '@neeraj-archive',
-};

package/src/core/config/analytics-event-and-category.js

@@ -6,9 +6,8 @@ export const analyticsCategories = {
   browse: 'BookReader-ReadingBrowse',
   preview: 'BookReader-Preview',
   satisfactionMetric: 'DetailsPage-Book',
-  purchase: 'BookReaderHeader',
-  unavailable: 'BookReader-Preview',
-  admin: 'Admin',
+  bookReaderHeader: 'BookReader-Header',
+  adminAccess: 'Admin-Access',
 };
 
 export const analyticsActions = {
@@ -21,4 +20,5 @@ export const analyticsActions = {
   login: 'LogIn',
   purchase: 'BWBPurchase',
   unavailable: 'Book-Unavailable',
+  printDisability: 'Print-Disability',
 };

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

@@ -33,7 +33,7 @@ export default class ActionsConfig {
     this.analyticsActions = analyticsActions;
   }
 
-  browseBookConfig() {
+  firstBrowseConfig() {
     return {
       id: 'browseBook',
       text: 'Borrow for 1 hour',
@@ -45,10 +45,22 @@ export default class ActionsConfig {
     };
   }
 
+  browseAgainConfig() {
+    return {
+      id: 'browseBookAgain',
+      text: 'Borrow again',
+      className: 'primary',
+      analyticsEvent: {
+        category: this.analyticsCategories.browse,
+        action: this.analyticsActions.browseAgain,
+      },
+    };
+  }
+
   returnBookConfig() {
     const eventCategory = this.lendingStatus.user_has_browsed
-      ? 'browse'
-      : 'borrow';
+      ? this.analyticsCategories.browse
+      : this.analyticsCategories.borrow;
 
     return {
       id: 'returnNow',
@@ -77,7 +89,7 @@ export default class ActionsConfig {
       analyticsEvent: {
         category: this.lendingStatus.user_has_browsed
           ? this.analyticsCategories.browse
-          : this.analyticsCategories.borrow,
+          : this.analyticsCategories.preview,
         action: this.analyticsActions.borrow,
       },
     };
@@ -161,7 +173,7 @@ export default class ActionsConfig {
       target: '_blank',
       className: 'purchase dark',
       analyticsEvent: {
-        category: this.analyticsCategories.purchase,
+        category: this.analyticsCategories.bookReaderHeader,
         action: this.analyticsActions.purchase,
       },
     };
@@ -179,8 +191,8 @@ export default class ActionsConfig {
       target: '_self',
       className: 'print-disability',
       analyticsEvent: {
-        category: this.analyticsCategories.purchase,
-        action: this.analyticsActions.purchase,
+        category: this.analyticsCategories.bookReaderHeader,
+        action: this.analyticsActions.printDisability,
       },
     };
   }
@@ -198,7 +210,7 @@ export default class ActionsConfig {
       target: '_self',
       className: 'danger',
       analyticsEvent: {
-        category: this.analyticsCategories.admin,
+        category: this.analyticsCategories.adminAccess,
         action: this.analyticsActions.borrow,
       },
     };
@@ -216,7 +228,7 @@ export default class ActionsConfig {
       target: '_self',
       className: 'ia-button',
       analyticsEvent: {
-        category: this.analyticsCategories.admin,
+        category: this.analyticsCategories.adminAccess,
         action: this.analyticsActions.doneBorrowing,
       },
     };
@@ -229,7 +241,7 @@ export default class ActionsConfig {
       className: 'primary unavailable',
       disabled: true,
       analyticsEvent: {
-        category: this.analyticsCategories.unavailable,
+        category: this.analyticsCategories.preview,
         action: this.analyticsActions.unavailable,
       },
     };

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

@@ -17,7 +17,7 @@ export default class ActionsHandler extends LitElement {
   constructor(identifier) {
     super();
     this.identifier = identifier;
-    this.ajaxTimeout = 5000;
+    this.ajaxTimeout = 6000;
     this.bindEvents();
   }
 

package/src/core/services/get-lending-actions.js

@@ -104,7 +104,7 @@ export default class GetLendingActions {
     const leaveWaitlist = this.actionsConfig.leaveWaitlistConfig();
     const borrowBook = this.actionsConfig.borrowBookConfig();
     const browseBook = lendingStatus.available_to_browse
-      ? this.actionsConfig.browseBookConfig()
+      ? this.actionsConfig.firstBrowseConfig()
       : null;
 
     const dropdownOptions = browseBook ? [browseBook, borrowBook] : [];
@@ -150,7 +150,7 @@ export default class GetLendingActions {
       primaryTitle: 'You are on the waitlist for this book.',
       primaryActions: [
         this.actionsConfig.leaveWaitlistConfig(),
-        this.actionsConfig.browseBookConfig(),
+        this.actionsConfig.firstBrowseConfig(),
       ],
       primaryColor: 'primary',
       secondaryActions: [
@@ -160,10 +160,18 @@ export default class GetLendingActions {
     };
   }
 
+  // check restricted item behaviour here /activemeasuresse0000ridt
   restrictedAction() {
-    // check restricted item behaviour here /activemeasuresse0000ridt
+    const lendingStatus = this.lendingStatus || {};
+    const anotherPatronUsing =
+      lendingStatus.max_browsable_copies &&
+      !lendingStatus.available_lendable_copies;
+    const title = anotherPatronUsing
+      ? 'Another patron is using this book. Please check back later.'
+      : 'This book is not available at this time.';
+
     return {
-      primaryTitle: 'This book is not available at this time.',
+      primaryTitle: title,
       primaryActions: [this.actionsConfig.unavailableBookConfig()],
       primaryColor: 'primary',
       secondaryActions: [
@@ -192,7 +200,9 @@ export default class GetLendingActions {
       borrow = this.actionsConfig.unavailableBookConfig();
     }
 
-    const actions = [borrow, waitlist].filter(action => {
+    const printDisability = this.actionsConfig.printDisabilityConfig();
+
+    const actions = [borrow, waitlist, printDisability].filter(action => {
       return action !== null;
     });
 
@@ -255,25 +265,9 @@ export default class GetLendingActions {
       : possibleTitles.one_hour;
 
     // one hour borrow config
-    const oneHrBorrowText = browsingHasExpired
-      ? 'Borrow again'
-      : 'Borrow for 1 hour';
-    const browseAgainEvent = {
-      category: this.analyticsCategories.browse,
-      action: this.analyticsActions.browseAgain,
-    };
-    const firstBrowseEvent = {
-      category: this.analyticsCategories.preview,
-      action: this.analyticsActions.browse,
-    };
-    const oneHrBorrowEvent = browsingHasExpired
-      ? browseAgainEvent
-      : firstBrowseEvent;
-
-    const oneHrBorrow = this.actionsConfig.browseBookConfig(
-      oneHrBorrowText,
-      oneHrBorrowEvent
-    );
+    const oneHrBorrow = browsingHasExpired
+      ? this.actionsConfig.browseAgainConfig()
+      : this.actionsConfig.firstBrowseConfig();
 
     const borrow = this.actionsConfig.borrowBookConfig();
     const waitlist = this.actionsConfig.waitlistConfig();
@@ -308,10 +302,7 @@ export default class GetLendingActions {
       return this.loggedOutOptions();
     }
 
-    const canBrowse =
-      lendingStatus.available_to_browse ||
-      (!lendingStatus.available_to_browse && lendingStatus.browsingExpired);
-    if (canBrowse) {
+    if (lendingStatus.available_to_browse || lendingStatus.browsingExpired) {
       return this.borrow1HrAction();
     }
 
@@ -378,7 +369,8 @@ export default class GetLendingActions {
       lendingStatus.user_is_printdisabled;
 
     const patronIsReading =
-      lendingStatus.user_has_borrowed || lendingStatus.user_has_browsed;
+      lendingStatus.user_has_borrowed ||
+      (lendingStatus.user_has_browsed && !lendingStatus.browsingExpired);
 
     const notBorrowed =
       !lendingStatus.user_has_borrowed && !lendingStatus.user_has_browsed;
@@ -414,7 +406,7 @@ export default class GetLendingActions {
       lendingActions = this.leaveWaitlistAction();
     } else if (userCanAccessPrintDisabled) {
       lendingActions = this.borrowPrintDisabledAction();
-    } else if (canBorrow) {
+    } else if (canBorrow || lendingStatus.browsingExpired) {
       lendingActions = this.borrowAction();
     } else if (lendingStatus.isPrintDisabledOnly) {
       lendingActions = this.onlyPrintDisabledAction();

package/src/ia-book-actions.js

@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 import { html, css, LitElement } from 'lit-element';
 
 import { SharedResizeObserver } from '@internetarchive/shared-resize-observer';
@@ -32,7 +33,7 @@ export default class IABookActions extends LitElement {
     this.secondaryActions = [];
     this.width = 0;
     this.bwbPurchaseUrl = '';
-    this.lendingOptions = [];
+    this.lendingOptions = {};
     this.sharedObserver = undefined;
   }
 
@@ -60,6 +61,28 @@ export default class IABookActions extends LitElement {
     }
   }
 
+  browseHasExpired() {
+    const browsingExpired = true;
+    const currStatus = { ...this.lendingStatus, browsingExpired };
+    this.lendingStatus = currStatus;
+  }
+
+  startBrowseTimer() {
+    const {
+      browsingExpired,
+      user_has_browsed,
+      secondsLeftOnLoan,
+    } = this.lendingStatus;
+    if (!user_has_browsed || browsingExpired) {
+      return;
+    }
+
+    const timeLeft = secondsLeftOnLoan * 1000;
+    setTimeout(() => {
+      this.browseHasExpired();
+    }, timeLeft);
+  }
+
   /** SharedObserver resize handler */
   handleResize(entry) {
     // if you are observing multiple targets,
@@ -111,6 +134,13 @@ export default class IABookActions extends LitElement {
     this.secondaryActions = actions.secondaryActions.filter(action => {
       return action != null;
     });
+
+    if (
+      this.lendingStatus.user_has_browsed &&
+      !this.lendingStatus.browseHasExpired
+    ) {
+      this.startBrowseTimer();
+    }
   }
 
   render() {
@@ -159,8 +189,8 @@ export default class IABookActions extends LitElement {
     return css`
       :host {
         display: block;
-        background: var(--secondaryBGColor);
-        color: var(--primaryTextColor);
+        background: var(--primaryBGColor, #000);
+        color: var(--primaryTextColor, #fff);
       }
       .lending-wrapper {
         width: 100%;

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

@@ -1,4 +1,5 @@
-import { html, fixture, expect } from '@open-wc/testing';
+import { html, fixture, expect, aTimeout } from '@open-wc/testing';
+
 import '../src/ia-book-actions.js';
 import Sinon from 'sinon';
 
@@ -159,40 +160,79 @@ describe('Borrow status actions', () => {
     expect(el.primaryActions[0].text).to.equal(expectedPrimaryActions[0].text);
     expect(el.primaryActions[1].text).to.equal('Borrow for 14 days');
   });
+});
 
-  describe('Shared Resize Observer', () => {
-    it('can receive a Shared Resize Observer', async () => {
-      const sharedObserverStub = new SharedResizeObserver();
-      const addObserverSpy = Sinon.spy(sharedObserverStub, 'addObserver');
-      const component = await fixture(html` <ia-book-actions
-        .userid=${'@userid'}
-        .identifier=${'foo'}
-        .lendingStatus=${{
+describe('Browsing expired status', () => {
+  it('Book is browsed but not expired', async () => {
+    const el = await fixture(
+      container({
+        userid: '@userid',
+        lendingStatus: {
           is_lendable: true,
           user_has_browsed: true,
-          available_to_browse: true,
-          available_to_borrow: true,
-        }}
-        .sharedObserver=${sharedObserverStub}
-      ></ia-book-actions>`);
-      await component.updateComplete;
-
-      expect(addObserverSpy.callCount).to.equal(1);
-    });
-    it('loads its own resize observer if it is not received', async () => {
-      const component = await fixture(html` <ia-book-actions
-        .userid=${'@userid'}
-        .identifier=${'foo'}
-        .lendingStatus=${{
+          browseHasExpired: false,
+        },
+      })
+    );
+    expect(el.primaryTitle).contains('Borrow ends at ');
+    expect(el.primaryActions[0].text).to.equal('Return now');
+    expect(el.primaryActions[1].text).to.equal('Print Disability Access');
+  });
+
+  it('Book is browsing and going to expire after 1 second', async () => {
+    const el = await fixture(
+      container({
+        userid: '@userid',
+        lendingStatus: {
           is_lendable: true,
           user_has_browsed: true,
-          available_to_browse: true,
-          available_to_borrow: true,
-        }}
-      ></ia-book-actions>`);
+          browseHasExpired: false,
+          secondsLeftOnLoan: 1,
+        },
+      })
+    );
+
+    await aTimeout(1500); // wait for 1.5 second
+    el.updateComplete;
+
+    expect(el.primaryTitle).contains('Your loan has expired.');
+    expect(el.primaryActions[0].text).to.equal('Borrow again');
+  });
+});
+
+describe('Shared Resize Observer', () => {
+  it('can receive a Shared Resize Observer', async () => {
+    const sharedObserverStub = new SharedResizeObserver();
+    const addObserverSpy = Sinon.spy(sharedObserverStub, 'addObserver');
+    const component = await fixture(html` <ia-book-actions
+      .userid=${'@userid'}
+      .identifier=${'foo'}
+      .lendingStatus=${{
+        is_lendable: true,
+        user_has_browsed: true,
+        available_to_browse: true,
+        available_to_borrow: true,
+      }}
+      .sharedObserver=${sharedObserverStub}
+    ></ia-book-actions>`);
+    await component.updateComplete;
+
+    expect(addObserverSpy.callCount).to.equal(1);
+  });
 
-      await component.updateComplete;
-      expect(component.sharedObserver).to.not.be.undefined;
-    });
+  it('loads its own resize observer if it is not received', async () => {
+    const component = await fixture(html` <ia-book-actions
+      .userid=${'@userid'}
+      .identifier=${'foo'}
+      .lendingStatus=${{
+        is_lendable: true,
+        user_has_browsed: true,
+        available_to_browse: true,
+        available_to_borrow: true,
+      }}
+    ></ia-book-actions>`);
+
+    await component.updateComplete;
+    expect(component.sharedObserver).to.not.be.undefined;
   });
 });