@internetarchive/bookreader 5.0.0-44 → 5.0.0-44-a1

package/BookReaderDemo/IADemoBr.js

@@ -15,10 +15,18 @@ const searchTerm = urlParams.get('q');
 const iaBookReader = document.querySelector('ia-bookreader');
 
 const downloadListWithLCP = [
+  [
+    "PDF",
+    "regular pdf link"
+  ],
   [
     "lcpPDF",
     "link to lcp pdf"
   ],
+  [
+    "ePub",
+    "link to epub"
+  ],
   [
     "lcpEPUB",
     "link to lcp epub"

package/CHANGELOG.md

@@ -1,8 +1,3 @@
-# 5.0.0-44
-Fix: dynamic `q=<term>` url parameter @iisa
-Fix: lcp download links @iisa
-Dev: dependency updates @renovate
-
 # 5.0.0-43
 Fix: search results panel display asserted page numbers @cdrini
 Dev: dependency updates @renovate

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/bookreader",
-  "version": "5.0.0-44",
+  "version": "5.0.0-44-a1",
   "description": "The Internet Archive BookReader.",
   "repository": {
     "type": "git",
@@ -51,14 +51,14 @@
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "babel-loader": "8.2.5",
     "codecov": "^3.8.3",
-    "concurrently": "7.2.2",
+    "concurrently": "7.1.0",
     "core-js": "3.22.3",
     "cpx2": "4.2.0",
     "eslint": "^7.32.0",
     "eslint-plugin-no-jquery": "^2.7.0",
     "eslint-plugin-testcafe": "^0.2.1",
     "hammerjs": "^2.0.8",
-    "http-server": "14.1.1",
+    "http-server": "14.1.0",
     "iso-language-codes": "1.1.0",
     "jest": "^28.1.0",
     "jest-environment-jsdom": "^28.1.0",
@@ -69,13 +69,13 @@
     "jquery.browser": "0.1.0",
     "jquery.mmenu": "5.6.5",
     "live-server": "1.2.2",
-    "node-fetch": "3.2.10",
+    "node-fetch": "3.2.4",
     "regenerator-runtime": "0.13.9",
-    "sass": "1.52.1",
+    "sass": "1.51.0",
     "sinon": "^14.0.0",
     "soundmanager2": "2.97.20170602",
     "svgo": "2.8.0",
-    "testcafe": "^1.19.0",
+    "testcafe": "^1.18.6",
     "testcafe-browser-provider-browserstack": "^1.13.2-alpha.1",
     "webpack": "5.51.1",
     "webpack-cli": "4.9.2"

package/src/BookNavigator/downloads/downloads.js

@@ -73,9 +73,9 @@ export class IABookDownloads extends LitElement {
     return html`
     <p>For LCP downloads, make sure you have SimplyE or Aldiko Next installed on mobile or Thorium on desktop.</p>
     <ul>
-      <li><a href="https://librarysimplified.org/simplye/" rel="noopener noreferrer nofollow" target="_blank">Install SimplyE</a></li>
-      <li><a href="https://www.demarque.com/en-aldiko" rel="noopener noreferrer nofollow" target="_blank">Install Aldiko</a></li>
-      <li><a href="https://www.edrlab.org/software/thorium-reader/" rel="noopener noreferrer nofollow" target="_blank">Install Thorium</a></li>
+      <li><a href="https://librarysimplified.org/simplye/" rel="noopener noreferrer" target="_blank">Install SimplyE</a></li>
+      <li><a href="https://www.demarque.com/en-aldiko" rel="noopener noreferrer" target="_blank">Install Aldiko</a></li>
+      <li><a href="https://www.edrlab.org/software/thorium-reader/" rel="noopener noreferrer" target="_blank">Install Thorium</a></li>
     </ul>
   `;
   }
@@ -85,10 +85,8 @@ export class IABookDownloads extends LitElement {
       ${this.header}
       ${this.loanExpiryMessage}
       <ul>${this.renderDownloadOptions()}</ul>
-      ${this.hasLCPOption
-      ? this.installSimplyEAldikoThoriumMsg
-      : (this.isBookProtected ? this.accessProtectedBook : nothing)
-      }
+      ${this.hasLCPOption ? this.installSimplyEAldikoThoriumMsg : nothing}
+      ${this.isBookProtected && !this.hasLCPOption ? this.accessProtectedBook : nothing}
     `;
   }
 

package/src/BookNavigator/search/search-provider.js

@@ -75,10 +75,6 @@ export default class SearchProvider {
       searchCanceled: true
     };
     this.updateMenu(updateMenuFor);
-
-    if (this.bookreader.urlPlugin) {
-      this.updateSearchInUrl();
-    }
   }
 
   onSearchStarted(e) {
@@ -150,21 +146,6 @@ export default class SearchProvider {
     };
     this.updateMenu({ openMenu: false });
     this.bookreader?.searchView?.clearSearchFieldAndResults(false);
-    if (this.bookreader.urlPlugin) {
-      this.updateSearchInUrl();
-    }
-  }
-
-  /** update URL `q=<term>` query param in URL */
-  updateSearchInUrl() {
-    if (this.bookreader.urlPlugin) {
-      this.bookreader.urlPlugin.pullFromAddressBar();
-      if (searchState.query) {
-        this.bookreader.urlPlugin.setUrlParam('q', searchState.query);
-      } else {
-        this.bookreader.urlPlugin.removeUrlParam('q');
-      }
-    }
   }
 
   /**

package/src/BookNavigator/search/search-results.js

@@ -60,9 +60,6 @@ export class IABookSearchResults extends LitElement {
 
   setQuery(e) {
     this.query = e.currentTarget.value;
-    if (!this.query) {
-      this.cancelSearch();
-    }
   }
 
   performSearch(e) {
@@ -151,7 +148,6 @@ export class IABookSearchResults extends LitElement {
             name="query"
             alt="Search inside this book."
             @keyup=${this.setQuery}
-            @search=${this.setQuery}
             .value=${this.query}
           />
         </fieldset>

package/tests/jest/BookNavigator/search/search-provider.test.js

@@ -102,66 +102,5 @@ describe('Search Provider', () => {
 
       expect(provider.bookreader._searchPluginGoToResult.callCount).toEqual(1);
     });
-    test('update url when search is cancelled or input cleared', async() => {
-      const urlPluginMock = {
-        pullFromAddressBar: sinon.fake(),
-        removeUrlParam: sinon.fake()
-      };
-      const provider = new searchProvider({
-        onProviderChange: sinon.fake(),
-        bookreader: {
-          leafNumToIndex: sinon.fake(),
-          _searchPluginGoToResult: sinon.fake(),
-          urlPlugin: urlPluginMock
-        }
-      });
-
-      provider.onSearchCanceled();
-      await provider.updateComplete;
-
-      expect(urlPluginMock.pullFromAddressBar.callCount).toEqual(1);
-      expect(urlPluginMock.removeUrlParam.callCount).toEqual(1);
-
-      provider.onSearchCanceled();
-      await provider.updateComplete;
-
-      expect(urlPluginMock.pullFromAddressBar.callCount).toEqual(2);
-      expect(urlPluginMock.removeUrlParam.callCount).toEqual(2);
-    });
-    it('updateSearchInUrl', async () => {
-      let fieldToSet;
-      let valueOfFieldToSet;
-      let setUrlParamCalled = false;
-      const urlPluginMock = {
-        pullFromAddressBar: sinon.fake(),
-        removeUrlParam: sinon.fake(),
-        setUrlParam: (field, val) => {
-          fieldToSet = field;
-          valueOfFieldToSet = val;
-          setUrlParamCalled = true;
-        }
-      };
-      const provider = new searchProvider({
-        onProviderChange: sinon.fake(),
-        bookreader: {
-          leafNumToIndex: sinon.fake(),
-          _searchPluginGoToResult: sinon.fake(),
-          urlPlugin: urlPluginMock,
-          search: sinon.fake()
-        }
-      });
-
-      const searchInitiatedEvent = new CustomEvent('bookSearchInitiated', { detail: { query: 'foobar' } });
-      // set initial seachState with a query
-      provider.onBookSearchInitiated(searchInitiatedEvent);
-      await provider.updateComplete;
-      // checking this fn:
-      provider.updateSearchInUrl();
-      await provider.updateComplete;
-
-      expect(fieldToSet).toEqual('q');
-      expect(valueOfFieldToSet).toEqual('foobar');
-      expect(setUrlParamCalled).toBe(true);
-    });
   });
 });

package/tests/jest/BookNavigator/search/search-results.test.js

@@ -236,17 +236,4 @@ describe('<ia-book-search-results>', () => {
 
     expect(response).toBeDefined();
   });
-  it('cancels search when input is cleared', async () => {
-    const el = await fixture(container(results));
-
-    el.cancelSearch = sinon.fake();
-    await el.updateComplete;
-
-    const searchInput = el.shadowRoot.querySelector('[name="query"]');
-
-    searchInput.value = '';
-    searchInput.dispatchEvent(new Event('search'));
-
-    expect(el.cancelSearch.callCount).toEqual(1);
-  });
 });