@internetarchive/ia-book-actions 0.0.18 → 0.0.19-3

package/package.json

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

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

@@ -14,18 +14,15 @@ export default css`
     align-items: center;
   }
   .action-buttons .ia-button {
-    display: inline-flex;
-    align-items: center;
-    vertical-align: middle;
+    margin: 0;
     height: 3.5rem;
-    transition: all 0.1s ease 0s;
-    vertical-align: middle;
-    padding: 0 1rem;
-    margin: 0 3px;
   }
   .primary,
   .secondary {
     position: relative;
+    background-color: var(--white, #fff);
+    border-radius: 5px;
+    margin: 0 3px;
   }
   .primary .initial {
     border-radius: 0.4rem 0 0 0.4rem;
@@ -51,9 +48,9 @@ export default css`
   }
   .dropdown-content .ia-button {
     background: none;
+    color: var(--primaryTextColor, #fff);
     border: none;
     box-sizing: border-box;
-    display: block;
     width: 100%;
     text-align: left;
     height: 3rem;
@@ -61,6 +58,9 @@ export default css`
     padding: 0.6rem 1.2rem;
     margin: 0;
   }
+  .dropdown-content .ia-button:is(:focus-visible, :hover) {
+    background: unset;
+  }
   .dropdown-content li .ia-button {
     border-radius: 0;
   }
@@ -115,6 +115,9 @@ export default css`
     display: inline-block;
     vertical-align: middle;
   }
+  .secondary .ia-button.exit-admin {
+    background-color: var(--primaryBGColor);
+  }
   .purchase small {
     display: block;
     font-size: 1rem;

package/src/assets/styles/ia-button.js

@@ -3,63 +3,88 @@ import { css } from 'lit';
 export default css`
   .ia-button {
     min-height: 3rem;
-    border: none;
-    outline: none;
     cursor: pointer;
-    color: #fff;
+    color: var(--primaryTextColor, #fff);
     line-height: normal;
     border-radius: 0.4rem;
-    text-align: center;
-    vertical-align: middle;
     font-size: 1.4rem;
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    display: inline-block;
-    padding: 0.85rem 1.2rem;
     border: 1px solid transparent;
     white-space: nowrap;
     appearance: auto;
     box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    transition: all 0.1s ease 0s;
+    vertical-align: middle;
+    padding: 0 1rem;
+    outline-color: var(--primaryTextColor, #fff);
+    outline-offset: -4px;
+    user-select: none;
+    text-decoration: none;
+    width: fit-content;
     -webkit-user-select: none;
     -moz-user-select: none;
     -ms-user-select: none;
     -o-user-select: none;
-    user-select: none;
   }
-  .ia-button:disabled,
-  .ia-button.disabled {
+  .ia-button:is(:focus-visible) {
+    outline-style: double;
+  }
+
+  .ia-button:disabled {
     cursor: not-allowed;
     background-color: var(--primaryDisableCTAFill, #767676);
     border: 1px solid var(--secondaryCTABorder, #999);
-    color: var(--primaryTextColor, #fff);
   }
   .ia-button.transparent {
     background-color: transparent;
   }
 
-  .ia-button.slim {
-    padding: 0;
+  .ia-button.warning {
+    background-color: #ee8950;
+    border-color: #ec7939;
   }
+
   .ia-button.primary {
-    background-color: #194880;
+    background-color: var(--primaryCTAFill, #194880);
     border-color: #c5d1df;
   }
-  .ia-button.dark {
-    color: #fff;
-    background-color: #333;
-    border-color: #979797;
+  .ia-button.primary:is(:hover) {
+    background-color: rgba(27, 72, 128, 0.9);
   }
+  .ia-button.primary:is(:focus-visible) {
+    background-color: rgba(27, 72, 128, 0.8);
+  }
+  .ia-button.primary:is(:active) {
+    background-color: rgba(27, 72, 128, 0.7);
+  }
+
   .ia-button.danger {
-    color: #fff;
-    background-color: #d9534f;
+    background-color: var(--primaryErrorCTAFill, #e51c26);
     border-color: #d43f3a;
   }
-  .ia-button.warning {
-    color: #fff;
-    background-color: #ee8950;
-    border-color: #ec7939;
+  .ia-button.danger:is(:hover) {
+    background-color: rgba(229, 28, 38, 0.9);
+  }
+  .ia-button.danger:is(:focus-visible) {
+    background-color: rgba(229, 28, 38, 0.8);
+  }
+  .ia-button.danger:is(:active) {
+    background-color: rgba(229, 28, 38, 0.7);
+  }
+
+  .ia-button.dark {
+    background-color: var(--secondaryCTAFill, #333);
+    border-color: #979797;
+  }
+  .ia-button.dark:is(:hover) {
+    background-color: rgba(51, 51, 51, 0.9);
+  }
+  .ia-button.dark:is(:focus-visible) {
+    background-color: rgba(51, 51, 51, 0.8);
   }
-  .ia-button.cancel {
-    background-color: #e51c26;
-    border-color: #f8c6c8;
+  .ia-button.dark:is(:active) {
+    background-color: rgba(51, 51, 51, 0.7);
   }
 `;

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

@@ -50,7 +50,10 @@ export class CollapsibleActionGroup extends ActionsHandler {
   }
 
   updated(changed) {
-    if (changed.has('width') && this.isBelowTabletContainer) {
+    if (
+      (changed.has('width') || changed.has('disabled')) &&
+      this.isBelowTabletContainer
+    ) {
       this.resetActions();
     }
   }
@@ -110,6 +113,9 @@ export class CollapsibleActionGroup extends ActionsHandler {
         <section class="action-buttons secondary">
           ${this.renderSecondaryActions}
         </section>
+        <section class="action-buttons secondary purchase">
+          ${this.renderPurchaseAction}
+        </section>
       </div>
     `;
   }
@@ -147,13 +153,27 @@ export class CollapsibleActionGroup extends ActionsHandler {
     return this.secondaryActions.map(action => this.renderActionLink(action));
   }
 
+  get renderPurchaseAction() {
+    if (!this.secondaryActions.length) return nothing;
+
+    if (this.secondaryActions.length === 2) {
+      return this.renderActionLink(this.secondaryActions[1], true);
+    }
+    if (this.secondaryActions[0].id === 'purchaseBook') {
+      return this.renderActionLink(this.secondaryActions[0], true);
+    }
+    return nothing;
+  }
+
   /**
-   * Render action as a link for secondary actions like admin, purchase, printdisability links.
+   * Render action as a link for secondary actions like admin, printdisability links.
    * @param { Object } action
    * @param { Boolean } initialButton
    * @returns { HTMLElement }
    */
   renderActionLink(action, initialButton = false) {
+    if (!initialButton && action?.id === 'purchaseBook') return nothing; // handle purchase action differerntly
+
     return html`<a
       class="ia-button ${action.className} ${initialButton ? 'initial' : ''}"
       href="${action.url}"

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

@@ -226,7 +226,7 @@ export default class ActionsConfig {
       text: message,
       url: URLHelper.getBackHref(),
       target: '_self',
-      className: 'ia-button',
+      className: 'exit-admin',
       analyticsEvent: {
         category: this.analyticsCategories.adminAccess,
         action: this.analyticsActions.doneBorrowing,

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

@@ -4,7 +4,7 @@
  * Helper to call loan service
  * @param {Object} options
  */
-export default function ActionsHandlerService(options) {
+export default async function ActionsHandlerService(options) {
   const option = {
     action: null,
     identifier: '',
@@ -16,7 +16,11 @@ export default function ActionsHandlerService(options) {
   let baseHost = '/services/loans/loan';
   const location = window?.location;
 
-  // return intentional error on dev environment
+  // return error reponse when not production and has ?error=true param...
+  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 shouldReturnError =
     location?.href?.indexOf('?error=true') !== -1 &&
     location?.hostname !== 'archive.org';
@@ -26,43 +30,39 @@ export default function ActionsHandlerService(options) {
   let formData = new FormData();
   formData.append('action', option.action);
   formData.append('identifier', option.identifier);
+  try {
+    await fetch(baseHost, {
+      method: 'POST',
+      body: formData,
+    })
+      .then(response => {
+        // intentional error on localhost
+        if (shouldReturnError && erroneousActions.includes(option?.action)) {
+          return {
+            success: false,
+            error: option?.action === 'create_token' ? tokenError : borrowError,
+          };
+        }
 
-  fetch(baseHost, {
-    method: 'POST',
-    body: formData,
-  })
-    .then(response => {
-      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.';
-
-      // return error reponse when not production and has ?error=true param...
-      const erroneousActions = ['browse_book', 'borrow_book', 'create_token'];
-      if (shouldReturnError && erroneousActions.includes(option?.action)) {
-        return {
-          success: false,
-          error: option?.action === 'create_token' ? tokenError : borrowError,
-        };
-      }
-
-      // return success response for /demo/ server...
-      if (baseHost == '/demo/1' || baseHost == '/demo/') {
-        return {
-          success: true,
-          message: 'operation executed successfully!',
-        };
-      }
+        // return success response for /demo/ server...
+        if (baseHost == '/demo/1' || baseHost == '/demo/') {
+          return {
+            success: true,
+            message: 'operation executed successfully!',
+          };
+        }
 
-      // 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.
-      if (!data?.error) {
-        option?.success(data);
-      } else {
-        option?.error(data);
-      }
-    });
+        // 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.
+        if (!data?.error) {
+          option?.success(data);
+        } else {
+          option?.error(data);
+        }
+      });
+  } catch (err) {}
 }

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

@@ -188,6 +188,9 @@ export default class ActionsHandler extends LitElement {
    * @fires ActionsHandler#lendingActionError
    */
   dispatchActionError(action, data = {}) {
+    // send LendingServiceError to GA
+    this.sendEvent('LendingServiceError', action);
+
     this.dispatchEvent(
       new CustomEvent('lendingActionError', {
         detail: { action, data },