@internetarchive/ia-book-actions 0.0.22-3 → 0.0.23-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.22-3",
+  "version": "0.0.23-1",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",
@@ -20,9 +20,9 @@
   "dependencies": {
     "@internetarchive/icon-info": "^1.2.6",
     "@internetarchive/local-cache": "^0.2.0",
-    "@internetarchive/modal-manager": "^0.2.2",
+    "@internetarchive/modal-manager": "^0.2.1",
     "@internetarchive/shared-resize-observer": "^0.2.0",
-    "lit": "^2.2.2"
+    "lit": "^2.2.1"
   },
   "devDependencies": {
     "@open-wc/eslint-config": "^4.2.0",

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

@@ -93,7 +93,7 @@ export default css`
   }
   .open {
     display: block;
-    z-index: 2;
+    z-index: 4;
   }
   .visible {
     display: inline-block;

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

@@ -86,6 +86,7 @@ export class GetLendingActions {
       primaryTitle: '',
       primaryActions: [],
       secondaryActions: [this.actionsConfig.adminOrPrintDisabledExitConfig()],
+      borrowType: 'adminBorrowed',
     };
   }
 

package/src/core/services/loan-token-poller.js

@@ -1,5 +1,6 @@
 import ActionsHandlerService from './actions-handler/actions-handler-service.js';
 import * as Cookies from './doc-cookies.js';
+import { analyticsCategories } from '../config/analytics-event-and-category.js';
 
 /**
  * This class is used to create loan token for borrowed books
@@ -13,6 +14,7 @@ export class LoanTokenPoller {
     this.successCallback = successCallback; // callback function to be called after loan token is created
     this.errorCallback = errorCallback; // callback function to be called after loan token is created
     this.pollerDelay = pollerDelay; // value in ms (1000 ms = 1 sec)
+    this.analyticsCategories = analyticsCategories;
 
     this.loanTokenInterval = undefined;
     this.enableBookAccess();
@@ -46,9 +48,14 @@ export class LoanTokenPoller {
       // Do an initial token, then set an interval
       this.handleLoanTokenPoller(true);
 
-      this.loanTokenInterval = setInterval(() => {
-        this.handleLoanTokenPoller();
-      }, this.pollerDelay);
+      // if this.borrowType = adminBorrowed,
+      // - we don't want to fetch token on interval
+      // - the initial token is enough to set cookies for reading book and readaloud features
+      if (this.borrowType !== 'adminBorrowed') {
+        this.loanTokenInterval = setInterval(() => {
+          this.handleLoanTokenPoller();
+        }, this.pollerDelay);
+      }
 
       // event category and action for browsing book access
       const category = `${this.borrowType}BookAccess`;
@@ -64,13 +71,14 @@ export class LoanTokenPoller {
     }
   }
 
-  sendEvent(eventCategory, eventAction) {
+  sendEvent(eventCategory, eventAction, extraParams = {}) {
     // eslint-disable-next-line no-console
-    console?.log('Book action: ', { eventCategory, eventAction });
+    console?.log('Book action: ', { eventCategory, eventAction, extraParams });
     window?.archive_analytics?.send_event_no_sampling(
       eventCategory,
       eventAction,
-      `identifier=${this.identifier}`
+      `identifier=${this.identifier}`,
+      extraParams
     );
   }
 
@@ -80,7 +88,15 @@ export class LoanTokenPoller {
       identifier: this.identifier,
       action,
       error: data => {
-        window?.Sentry?.captureMessage('handleLoanTokenPoller error');
+        window?.Sentry?.captureMessage(`
+          handleLoanTokenPoller error, identifier:${this.identifier}, borrowType:${this.borrowType}, interval:${this.loanTokenInterval}
+        `);
+        this.sendEvent(this.analyticsCategories.browse, 'LoanTokenError', {
+          identifier: this.identifier,
+          isInitial: isInitial,
+          borrowType: this.borrowType,
+          interval: this.loanTokenInterval,
+        });
         this.disconnectedInterval(); // stop token fetch api
         this.errorCallback({ detail: { action, data } });
       },

package/test/core/services/loan-token-poller.test.js

@@ -6,9 +6,6 @@ import { LoanTokenPoller } from '../../../src/core/services/loan-token-poller.js
 
 describe('Get Loan Token', () => {
   it('get loan token for browsed books', async () => {
-    // const localCacheStub = new LocalCache();
-    // const localCacheGetSpy = Sinon.spy(localCacheStub, 'get');
-
     const tokenPoller = new LoanTokenPoller(
       'identifier1',
       'browsed',
@@ -24,17 +21,26 @@ describe('Get Loan Token', () => {
     successCallbackSpy();
     expect(successCallbackSpy.callCount).to.equal(1);
 
-    // localCacheGetSpy();
-    // expect(localCacheGetSpy.callCount).to.equal(1);
-
-    // expect(tokenPoller.localCache.namespace).to.equal('LocalCache');
-    // expect(tokenPoller.localCache.get).to.be.a('function');
-
-    // tokenPoller.disconnectedInterval(); // clear token poller interval
-    // expect(tokenPoller.loanTokenInterval).to.equal(undefined);
-
     tokenPoller.handleLoanTokenPoller(true);
     expect(tokenPoller.errorCallback).to.be.a('function');
     expect(tokenPoller.successCallback).have;
   });
+
+  it('get loan token for admin borrowed books', async () => {
+    const tokenPoller = new LoanTokenPoller(
+      'identifier1',
+      'adminBorrowed',
+      () => {},
+      () => {},
+      2000 // 2 minutes'
+    );
+
+    const successCallbackSpy = Sinon.stub(tokenPoller, 'successCallback');
+    successCallbackSpy();
+    expect(successCallbackSpy.callCount).to.equal(1);
+
+    // for adminBorrowed,
+    // - not initialize loanTokenInterval as don't need to fetch loan after specific interval
+    expect(tokenPoller.loanTokenInterval).to.equal(undefined);
+  });
 });