@internetarchive/ia-book-actions 0.1.11-b6 → 0.1.11-b8

package/package.json

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

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

@@ -21,7 +21,7 @@ export default async function ActionsHandlerService(options) {
   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 erroneousActions = ['browse_book', 'borrow_book', 'create_token', 'renew_loan'];
   const shouldReturnError =
     location?.href?.indexOf('?error=true') !== -1 &&
     location?.hostname !== 'archive.org';

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

@@ -142,7 +142,13 @@ export default class ActionsHandler extends LitElement {
       action,
       identifier: this.identifier,
       success: data => {
-        console.log("RENEW_LOAN --- ", data, action, data.loan, this.identifier);
+        console.log(
+          'RENEW_LOAN --- ',
+          data,
+          action,
+          data.loan,
+          this.identifier
+        );
         if (data?.success === true && data?.loan?.renewal === true) {
           this.setBrowseTimeSession();
           this.dispatchEvent(

package/src/ia-book-actions.js

@@ -77,7 +77,6 @@ export default class IABookActions extends LitElement {
     this.barType = 'action'; // 'title'|'action'
     this.sharedObserver = undefined;
     this.disableActionGroup = false;
-    this.modal = undefined;
     this.tokenDelay = 120; // in seconds
 
     // private props
@@ -308,19 +307,18 @@ export default class IABookActions extends LitElement {
     this.loanRenewResult = this.loanRenewHelper.result;
   }
 
-  /**
-   * create / select the modal-manager component on DOM
-   * @memberof IABookActions
-   */
-  async useModalManager() {
-    if (!this.modal) {
-      this.modal = document.querySelector('modal-manager');
+  /** @returns HTMLElement */
+  get modal() {
+    let modalOnDom = document.querySelector('modal-manager');
 
-      if (!this.modal) this.modal = document.createElement('modal-manager');
+    if (!modalOnDom) {
+      const newModal = document.createElement('modal-manager');
+      document.body.appendChild(newModal);
+      modalOnDom = newModal;
     }
 
-    this.modal.id = 'action-bar-modal';
-    await document.body.appendChild(this.modal);
+    modalOnDom.id = 'action-bar-modal';
+    return modalOnDom;
   }
 
   /**
@@ -328,7 +326,6 @@ export default class IABookActions extends LitElement {
    */
   async showWarningModal() {
     console.log('****** showWarningModal ******');
-    await this.useModalManager();
 
     // if secondsLeft < 60, consider it 1 minute
     let { secondsLeft } = this.loanRenewResult;
@@ -338,16 +335,17 @@ export default class IABookActions extends LitElement {
       secondsLeft = secondsLeft > 60 ? secondsLeft : 60;
     }
 
-    const config = new ModalConfig();
-    config.headline = 'Are you still here?';
-    config.showCloseButton = false;
-    config.closeOnBackdropClick = false;
-    config.message = this.loanRenewHelper?.getMessageTexts(
-      this.loanRenewResult.texts,
-      secondsLeft
-    );
+    const config = new ModalConfig({
+      headline: 'Are you still here?',
+      showCloseButton: false,
+      closeOnBackdropClick: false,
+      message: this.loanRenewHelper?.getMessageTexts(
+        this.loanRenewResult.texts,
+        secondsLeft
+      )
+    });
 
-    const customContent = html`<br />
+    const customModalContent = html`<br />
       <div id="custom-buttons" style="display:flex;justify-content:center;">
         <button
           style="${modalButtonStyle.iaButton} ${modalButtonStyle.renew}"
@@ -367,7 +365,7 @@ export default class IABookActions extends LitElement {
         </button>
       </div> `;
 
-    this.modal?.showModal({ config, customModalContent: customContent });
+    this.modal?.showModal({ config, customModalContent });
   }
 
   async patronWantsToRenewBook(event) {
@@ -403,15 +401,15 @@ export default class IABookActions extends LitElement {
    */
   async showExpiredModal() {
     console.log('showExpiredModal()');
-    await this.useModalManager();
 
-    const config = new ModalConfig();
-    config.headline = '';
-    config.showCloseButton = false;
-    config.closeOnBackdropClick = false;
-    config.message = 'This book has been returned due to inactivity.';
+    const config = new ModalConfig({
+      headline: '',
+      showCloseButton: false,
+      closeOnBackdropClick: false,
+      message: 'This book has been returned due to inactivity.'
+    });
 
-    const customContent = html`<br />
+    const customModalContent = html`<br />
       <div style="text-align: center">
         <button
           style="${modalButtonStyle.iaButton} ${modalButtonStyle.renew}"
@@ -423,7 +421,7 @@ export default class IABookActions extends LitElement {
         </button>
       </div> `;
 
-    this.modal?.showModal({ config, customModalContent: customContent });
+    this.modal?.showModal({ config, customModalContent });
   }
 
   /**
@@ -669,6 +667,7 @@ export default class IABookActions extends LitElement {
       await this.resetTimerCountState();
 
       // close the modal
+      this.modal.removeAttribute('id');
       this.modal?.remove();
       this.modal?.showModal({ config: {}, customModalContent: `` });
 
@@ -908,7 +907,6 @@ export default class IABookActions extends LitElement {
 
   /* show error message if something went wrong */
   async showErrorModal(errorMsg, action) {
-    await this.useModalManager();
 
     const modalConfig = new ModalConfig({
       title: 'Lending error',