@internetarchive/ia-book-actions 0.0.6-8 → 0.0.6-8-01

package/package.json

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

package/src/components/collapsible-action-group.js

@@ -63,7 +63,10 @@ export class CollapsibleActionGroup extends ActionsHandler {
     }
 
     // this is execute on demo page only
-    if (changed.has('bookHasBrowsed')) {
+    if (
+      changed.has('bookHasBrowsed') &&
+      window.location.pathname === '/demo/'
+    ) {
       this.emitFetchLoanToken();
     }
   }

package/src/components/dialog-alert.js

@@ -12,6 +12,7 @@ export class ShowDialog extends LitElement {
       body: { type: String },
       actions: { type: Array },
       opened: { type: Boolean },
+      allowClose: { type: Boolean },
     };
   }
 
@@ -22,6 +23,7 @@ export class ShowDialog extends LitElement {
       'Unexpected error: loan does not exist. Please try deleting your archive.org cookie.';
     this.actions = [];
     this.opened = false;
+    this.allowClose = false;
   }
 
   updated(changed) {
@@ -41,19 +43,22 @@ export class ShowDialog extends LitElement {
           closed: !this.opened,
         })}"
       >
-        <div class="dialog-head">
-          ${this.title}
-          <ia-icon-close
-            @click="${() =>
-              this.dispatchEvent(new CustomEvent('dialogAlertClose'))}"
-          ></ia-icon-close>
-        </div>
+        <div class="dialog-head">${this.title} ${this.closeButton}</div>
         <div class="dialog-body">${this.body}</div>
         <div class="dialog-foot">${this.renderActionButton}</div>
       </div>
     `;
   }
 
+  get closeButton() {
+    return this.allowClose
+      ? html`<ia-icon-close
+          @click="${() =>
+            this.dispatchEvent(new CustomEvent('dialogAlertClose'))}"
+        ></ia-icon-close>`
+      : html``;
+  }
+
   /* exceptional case to use dom element */
   addOverlay() {
     if (this.opened && !document.getElementById('ui-overlay')) {

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

@@ -32,7 +32,10 @@ export default function ActionsHandlerService(options) {
       // test changes, (won't affect you)
       if (baseHost == '/demo/1' || baseHost == '/demo/') {
         if (option.action == 'create_token') {
-          // return {'success': false, 'error': 'loan token not found. please try again later.',};
+          return {
+            success: false,
+            error: 'loan token not found. please try again later.',
+          };
           return {
             success: true,
             token: '1640945898-f77a0cb615190798f1faf2dafe277b2e',

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

@@ -15,7 +15,8 @@ export default class ActionsHandler extends LitElement {
     super();
     this.identifier = identifier;
     this.ajaxTimeout = 6000;
-    this.loanTokenPollingDelay = 20000; // 20000 ms = 20 sec
+    this.loanTokenPollingDelay =
+      window.location.pathname === '/demo/' ? 2000 : 20000; // 20000 ms = 20 sec
     this.loanTokenInterval = null;
     this.bindEvents();
   }
@@ -192,6 +193,7 @@ export default class ActionsHandler extends LitElement {
       action: context,
       error: data => {
         this.ActionError(context, data);
+        clearInterval(this.loanTokenInterval); // stop token fetch api
       },
     });
   }

package/src/ia-book-actions.js

@@ -23,7 +23,7 @@ export default class IABookActions extends LitElement {
       bwbPurchaseUrl: { type: String },
       barType: { type: String },
       sharedObserver: { attribute: false },
-      disable: { type: Boolean },
+      disableActionGroup: { type: Boolean },
       dialogVisible: { type: Boolean },
       bookHasBrowsed: { type: Boolean },
     };
@@ -166,7 +166,8 @@ export default class IABookActions extends LitElement {
         .title=${this.dialogTitle}
         .body=${this.dialogBody}
         .actions=${this.dialogActions}
-        ?opened="${this.dialogVisible}"
+        ?opened=${this.dialogVisible}
+        ?allowClose=${this.allowClose}
         @dialogAlertClose="${() => this.closeDialogAlert()}"
       ></show-dialog>
     `;
@@ -192,9 +193,9 @@ export default class IABookActions extends LitElement {
         .primaryActions=${this.primaryActions}
         .secondaryActions=${this.secondaryActions}
         .width=${this.width}
-        .hasAdminAccess=${this.hasAdminAccess}
-        .disabled=${this.disableActionGroup}
-        .bookHasBrowsed=${this.bookHasBrowsed}
+        ?hasAdminAccess=${this.hasAdminAccess}
+        ?disabled=${this.disableActionGroup}
+        ?bookHasBrowsed=${this.bookHasBrowsed}
         @lendingActionError=${this.handleLendingActionError}
       >
       </collapsible-action-group>
@@ -209,10 +210,8 @@ export default class IABookActions extends LitElement {
     const context = e?.detail?.context;
     const errorMsg = e?.detail?.data?.error;
 
-    // early exist if you don't have errorMsg
-    if (!errorMsg) return;
-
-    this.initializeDialogAlert(context, errorMsg);
+    // initiate dialog-alert if error occured
+    if (errorMsg) this.initializeDialogAlert(context, errorMsg);
 
     // update action bar state if book is not available to browse or borrow.
     if (errorMsg && errorMsg.match(/not available to borrow/gm)) {
@@ -237,14 +236,15 @@ export default class IABookActions extends LitElement {
     this.dialogVisible = true;
     this.dialogTitle = 'Sorry!';
     this.dialogBody = errorMsg;
-    this.dialogActions = [];
+    this.allowClose = true;
 
     if (context === 'create_token') {
+      this.allowClose = false;
       this.dialogActions = [
         {
           className: 'ia-button primary',
           text: 'Back to Item Details',
-          href: `/details/${this.lendingStatus.bookUrl}`,
+          href: this.lendingStatus.bookUrl,
         },
       ];
     }

package/test/components/dialog-alert.test.js

@@ -0,0 +1,62 @@
+/* eslint-disable */
+import { html, fixture, expect } from '@open-wc/testing';
+import '../../src/components/dialog-alert.js';
+
+const container = ({
+  title = '',
+  body = '',
+  allowClose = false,
+  opened = false,
+} = {}) =>
+  html`<show-dialog
+    .title=${title}
+    .body=${body}
+    ?allowClose=${allowClose}
+    ?opened=${opened}
+  ></show-dialog>`;
+
+describe('<show-dialog>', () => {
+  it('assign values and initiate dialog-alert', async () => {
+    const el = await fixture(
+      container({
+        title: 'internal error!',
+        body: 'there was an internal error',
+        opened: true,
+      })
+    );
+    expect(el.title).to.be.equal('internal error!');
+    expect(el.body).to.be.equal('there was an internal error');
+  });
+
+  it('close button should not render', async () => {
+    const el = await fixture(
+      container({
+        title: 'internal error!',
+        body: 'there was an internal error',
+      })
+    );
+    expect(el.title).to.be.equal('internal error!');
+    expect(el.body).to.be.equal('there was an internal error');
+
+    // close icon is not exist
+    const closeButton = el.shadowRoot.querySelector('ia-icon-close');
+    expect(closeButton).to.be.null;
+  });
+
+  it('close dialog-alert on X icon click', async () => {
+    const el = await fixture(
+      container({
+        title: 'internal error!',
+        body: 'there was an internal error',
+        allowClose: true,
+        opened: true,
+      })
+    );
+
+    const closeButton = el.shadowRoot.querySelector('ia-icon-close');
+    const errorEvent = new CustomEvent('dialogAlertClose');
+    closeButton.dispatchEvent(errorEvent);
+    await el.updateComplete;
+    expect(el.opened).to.be.true;
+  });
+});

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

@@ -130,7 +130,6 @@ describe('Borrow status actions', () => {
     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');