@internetarchive/ia-book-actions 0.0.30-alpha3 → 0.0.30-alpha5

package/package.json

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

package/src/components/text-group.js

@@ -5,7 +5,6 @@ export class TextGroup extends LitElement {
     return {
       texts: { type: String },
       textClass: { type: String },
-      hasAdminBorrowedAccess: { type: Boolean },
     };
   }
 
@@ -13,16 +12,11 @@ export class TextGroup extends LitElement {
     super();
     this.texts = '';
     this.textClass = '';
-    this.hasAdminBorrowedAccess = false;
   }
 
   render() {
     return html`
-      <span class="variable-texts ${this.textClass}">
-        ${this.hasAdminBorrowedAccess
-          ? html`<slot name="sticky-access-checkbox">${this.texts}</slot>`
-          : this.texts}
-      </span>
+      <span class="variable-texts ${this.textClass}">${this.texts}</span>
     `;
   }
 
@@ -35,13 +29,12 @@ export class TextGroup extends LitElement {
         margin-left: 10px;
         vertical-align: middle;
         font-size: 1.7rem;
-        align-items: center;
       }
       .hidden {
         display: none;
       }
       .visible {
-        display: flex;
+        display: inline-block;
       }
     `;
   }

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

@@ -8,8 +8,8 @@ export default async function ActionsHandlerService(options) {
   const option = {
     action: null,
     identifier: '',
-    success() {},
-    error() {},
+    success() { },
+    error() { },
     ...options,
   };
 
@@ -30,9 +30,6 @@ export default async function ActionsHandlerService(options) {
   let formData = new FormData();
   formData.append('action', option.action);
   formData.append('identifier', option.identifier);
-  formData.append('sticky-admin', option.stickyAccess);
-  console.log(option.stickyAccess);
-
   try {
     await fetch(baseHost, {
       method: 'POST',

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

@@ -83,6 +83,8 @@ export default class ActionsHandler extends LitElement {
       const { category, action } = detail.event;
       this.sendEvent(category, action);
 
+      this.setStickyAdminAccess(true);
+
       // keep existing params and add new one
       const url = new URL(window.location.href);
       url.searchParams.append('admin', 1);
@@ -92,20 +94,14 @@ export default class ActionsHandler extends LitElement {
     this.addEventListener('exitAdminAccess', ({ detail }) => {
       const { category, action } = detail.event;
       this.sendEvent(category, action);
+
+      this.setStickyAdminAccess(false);
     });
 
     this.addEventListener('bookTitleBar', ({ detail }) => {
       const { category, action } = detail.event;
       this.sendEvent(category, action);
     });
-
-    document.addEventListener('stickyAdminAccess', ({ detail }) => {
-      ActionsHandlerService({
-        action: 'toggle_sticky_admin_access', // toggle_sticky_admin_access
-        stickyAccess: detail.hasStickyAdminAccess,
-        identifier: this.identifier,
-      });
-    });
   }
 
   handleBrowseIt() {
@@ -293,4 +289,16 @@ export default class ActionsHandler extends LitElement {
       '.archive.org'
     );
   }
+
+  /**
+   * Set sticky admin access on or off.
+   * @see WEBDEV-6835
+   *
+   * @param {boolean} value - Whether to enable or disable sticky admin access.
+   * @returns {void}
+   */
+  setStickyAdminAccess(value) {
+    const domain = window.location.hostname !== 'localhost' ?? '.archive.org';
+    Cookies.setItem('sticky-admin-access', value, '', '/', domain);
+  }
 }

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

@@ -51,7 +51,6 @@ export const bookTitles = {
   on_waitlist: 'You are on the waitlist for this book.',
   session_expired: 'Your loan has expired.',
   unavailable: 'This book is not available at this time.',
-  admin_borrowed: 'Default to admin access mode',
 };
 
 export class GetLendingActions {
@@ -84,7 +83,7 @@ export class GetLendingActions {
 
   adminOrPrintDisabledReadingAction() {
     return {
-      primaryTitle: bookTitles.admin_borrowed,
+      primaryTitle: '',
       primaryActions: [],
       secondaryActions: [this.actionsConfig.adminOrPrintDisabledExitConfig()],
       borrowType: 'adminBorrowed',
@@ -234,8 +233,8 @@ export class GetLendingActions {
     const title = lendingStatus.available_to_browse
       ? bookTitles.available_1hr
       : lendingStatus.available_to_borrow
-      ? bookTitles.available_14d
-      : bookTitles.unavailable;
+        ? bookTitles.available_14d
+        : bookTitles.unavailable;
 
     return {
       primaryTitle: title,
@@ -278,16 +277,16 @@ export class GetLendingActions {
     const allBrowsableCopiesTaken =
       lendingStatus.available_browsable_copies < 1 &&
       lendingStatus.available_browsable_copies <
-        lendingStatus.max_browsable_copies;
+      lendingStatus.max_browsable_copies;
     // end config
 
     const title = browsingHasExpired
       ? bookTitles.session_expired
       : !canBrowse && allBrowsableCopiesTaken
-      ? bookTitles.being_borrowed
-      : !canBrowse && lendingStatus.available_to_waitlist
-      ? bookTitles.available_waitlist
-      : bookTitles.available_1hr;
+        ? bookTitles.being_borrowed
+        : !canBrowse && lendingStatus.available_to_waitlist
+          ? bookTitles.available_waitlist
+          : bookTitles.available_1hr;
 
     // one hour borrow config
     const oneHrBorrow = browsingHasExpired
@@ -301,8 +300,8 @@ export class GetLendingActions {
     const dropdownOptions = canBrowseAndBorrow
       ? [oneHrBorrow, borrow, printDisability]
       : canBrowseHasWaitlist
-      ? [oneHrBorrow, waitlist, printDisability]
-      : [];
+        ? [oneHrBorrow, waitlist, printDisability]
+        : [];
     const actions = canBrowseCantBorrowCantWaitlist
       ? [oneHrBorrow, printDisability]
       : dropdownOptions;

package/src/ia-book-actions.js

@@ -12,7 +12,7 @@ import './components/info-icon.js';
 import { GetLendingActions } from './core/services/get-lending-actions.js';
 import { mobileContainerWidth } from './core/config/constants.js';
 import { LoanTokenPoller } from './core/services/loan-token-poller.js';
-import { getItem, setItem } from './core/services/doc-cookies.js';
+import { setItem } from './core/services/doc-cookies.js';
 
 export const events = {
   browseExpired: 'IABookReader:BrowsingHasExpired',
@@ -37,7 +37,6 @@ export default class IABookActions extends LitElement {
       disableActionGroup: { type: Boolean },
       modal: { Object },
       tokenDelay: { type: Number },
-      hasStickyAdminAccess: { Boolean },
     };
   }
 
@@ -56,7 +55,6 @@ export default class IABookActions extends LitElement {
     this.disableActionGroup = false;
     this.modal = undefined;
     this.tokenDelay = 120000; // 2 minutes
-    this.hasStickyAdminAccess = false;
 
     // private props
     this.primaryActions = [];
@@ -79,9 +77,6 @@ export default class IABookActions extends LitElement {
       this.sharedObserver = new SharedResizeObserver();
       this.setupResizeObserver();
     }
-
-    // manage sticky-admin-acces by cookie
-    this.hasStickyAdminAccess = getItem('sticky-admin-access') === 'true';
   }
 
   updated(changed) {
@@ -369,22 +364,6 @@ export default class IABookActions extends LitElement {
     });
   }
 
-  // eslint-disable-next-line class-methods-use-this
-  toggleStickyAdminAccess() {
-    this.hasStickyAdminAccess = !this.hasStickyAdminAccess;
-
-    // set in cookies
-    setItem('sticky-admin-access', this.hasStickyAdminAccess);
-
-    document.dispatchEvent(
-      new CustomEvent('stickyAdminAccess', {
-        detail: {
-          hasStickyAdminAccess: this.hasStickyAdminAccess,
-        },
-      })
-    );
-  }
-
   get iconClass() {
     return this.width <= mobileContainerWidth ? 'mobile' : 'desktop';
   }
@@ -401,37 +380,10 @@ export default class IABookActions extends LitElement {
     return html`<text-group
       textClass=${this.textClass}
       texts=${this.primaryTitle}
-      ?hasAdminBorrowedAccess=${this.hasAdminBorrowedAccess}
     >
-      ${this.hasAdminBorrowedAccess
-        ? html`<div slot="sticky-access-checkbox">
-            ${this.stickyAdminAccess}
-          </div>`
-        : ''}
     </text-group>`;
   }
 
-  get stickyAdminAccess() {
-    return html`
-      <label class="stick-admin" for="sticky-admin-access">
-        <input
-          type="checkbox"
-          id="sticky-admin-access"
-          aria-label="Checkbox"
-          ?checked=${this.hasStickyAdminAccess}
-          @click=${this.toggleStickyAdminAccess}
-        />
-        <span>${this.primaryTitle}</span>
-      </label>
-    `;
-  }
-
-  get hasAdminBorrowedAccess() {
-    return this.secondaryActions.some(
-      action => action.id === 'exitAdminAccess'
-    );
-  }
-
   get hasAdminAccess() {
     return !this.lendingStatus.userHasBorrowed && this.lendingStatus.isAdmin;
   }
@@ -451,10 +403,6 @@ export default class IABookActions extends LitElement {
         justify-content: center;
         flex-wrap: wrap;
       }
-      .stick-admin {
-        user-select: none;
-        cursor: pointer;
-      }
     `;
   }
 }