Merge pull request #390 from pressbooks/dev

richard015ar · web-flow · commit 0428cb5abfea · 2021-07-26T10:53:12.000-04:00
v2.3 release
diff --git a/.env.example b/.env.example
@@ -1,10 +1,9 @@
 VITE_ALGOLIA_APP_ID=
 VITE_ALGOLIA_API_READ_KEY=
 VITE_ALGOLIA_INDEX=
-VITE_ALGOLIA_INDEX_WORD_COUNT_REPLICA=
+VITE_ALGOLIA_INDEX_ALPHABETICAL_REPLICA=
 VITE_ALGOLIA_INDEX_LAST_UPDATED_REPLICA=
 VITE_HEADER_ADDITIONAL_TEXT=
-VITE_HEADER_ADDITIONAL_TEXT=
 VITE_USER_NODE_ENV=
 VITE_APP_GA_MEASUREMENT_ID=
 BROWSERSTACK_USERNAME=
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -15,7 +15,7 @@ jobs:
       VITE_ALGOLIA_APP_ID: ${{ secrets.VITE_ALGOLIA_APP_ID }}
       VITE_ALGOLIA_API_READ_KEY: ${{ secrets.VITE_ALGOLIA_API_READ_KEY }}
       VITE_ALGOLIA_INDEX: ${{ secrets.VITE_ALGOLIA_INDEX }}
-      VITE_ALGOLIA_INDEX_WORD_COUNT_REPLICA: ${{ secrets.VITE_ALGOLIA_INDEX_WORD_COUNT_REPLICA }}
+      VITE_ALGOLIA_INDEX_ALPHABETICAL_REPLICA: ${{ secrets.VITE_ALGOLIA_INDEX_ALPHABETICAL_REPLICA }}
       VITE_ALGOLIA_INDEX_LAST_UPDATED_REPLICA: ${{ secrets.VITE_ALGOLIA_INDEX_LAST_UPDATED_REPLICA }}
       VITE_USER_NODE_ENV: ${{ secrets.VITE_USER_NODE_ENV }}
       BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USERNAME }}
diff --git a/e2e/integration/bookCards.spec.js b/e2e/integration/bookCards.spec.js
@@ -179,5 +179,13 @@ describe('Book cards', function () {
         .should('not.contain', 'Read more')
         .should('contain', 'Seventeen countries are represented, including the United States.');
     });
+    it('Fallback to cover image if image is not available', () => {
+      search('math');
+
+      cy.get(Elements.booksCards.cover)
+        .eq(1).find('img')
+        .should('have.attr', 'src')
+        .should('include', '/assets/images/default-book-cover.jpg');
+    });
   });
 });
diff --git a/e2e/integration/filters/bookCardFilters.spec.js b/e2e/integration/filters/bookCardFilters.spec.js
@@ -4,7 +4,7 @@ describe('BookCard Collections Filters', () => {
   context('Desktop Resolution', () => {
     it('Collection filter toggle', () => {
 
-      cy.visit('/?collec=OpenStax');
+      cy.visit('/?sort=updated&collec=OpenStax');
 
       cy.algoliaQueryRequest('algoliaRequest');
 
@@ -38,7 +38,7 @@ describe('BookCard Collections Filters', () => {
         .find('li:first-child button')
         .should('have.class', 'text-pb-red');
 
-      cy.url().should('include','?collec=OpenStax');
+      cy.url().should('include','collec=OpenStax');
 
     });
 
diff --git a/e2e/integration/filters/clearFilters.spec.js b/e2e/integration/filters/clearFilters.spec.js
@@ -4,7 +4,6 @@ import {
   clickFilter,
   perPage,
   search,
-  sortBy
 } from '../../support/common';
 import Elements from '../../support/elements';
 
@@ -20,7 +19,7 @@ describe('Clear Filters',() => {
 
     it('Clear chip refinement', () => {
       cy.url()
-        .should('include','?license=CC%20BY');
+        .should('include','license=CC%20BY');
 
       cy.get('[data-cy=chip-filter]').should('have.length', 3);
 
@@ -31,12 +30,12 @@ describe('Clear Filters',() => {
       cy.get('[data-cy=chip-filter]').should('have.length', 2);
 
       cy.url()
-        .should('include','?license=CC%20BY-NC-SA%26%26All%20Rights%20Reserved');
+        .should('include','license=CC%20BY-NC-SA%26%26All%20Rights%20Reserved');
     });
 
     it('Clear all refinements', () => {
       cy.url()
-        .should('include','?license=CC%20BY');
+        .should('include','license=CC%20BY');
 
       cy.get('[data-cy=chip-filter]').should('have.length', 3);
 
@@ -47,12 +46,11 @@ describe('Clear Filters',() => {
       cy.get('[data-cy=chip-filter]').should('have.length', 0);
 
       cy.url()
-        .should('not.contain','?');
+        .should('not.contain','&');
     });
 
     it('Clear all refinements should not reset search, per page, and sorting', () => {
       perPage(20);
-      sortBy('Word count');
       search('education');
 
       cy.url()
diff --git a/e2e/integration/filters/collections.spec.js b/e2e/integration/filters/collections.spec.js
@@ -27,7 +27,7 @@ describe('Filter collections', () => {
     });
 
     it('Filter by Interactive OER collection using URL', () => {
-      cy.visit('http://localhost:3001/?collec=Interactive%20OER')
+      cy.visit('/?sort=updated&collec=Interactive%20OER')
         .algoliaQueryRequest()
         .get('[data-cy=chip-filter]')
         .find('.text-sm')
diff --git a/e2e/integration/filters/lastUpdated.spec.js b/e2e/integration/filters/lastUpdated.spec.js
@@ -110,7 +110,7 @@ describe('Filter last updated', () => {
     });
 
     it('Applying "start date" using the URL filters books that were modified since then', () => {
-      cy.visit('/?updated=%3E%3D1619481600');
+      cy.visit('/?sort=updated&updated=%3E%3D1619481600');
 
       cy.algoliaQueryRequest()
         .get('[data-cy=chip-filter]')
@@ -130,7 +130,7 @@ describe('Filter last updated', () => {
     });
 
     it('Applying "to date" using the URL filters books that were modified until then', () => {
-      cy.visit('/?updated=%3C%3D1619567999');
+      cy.visit('/?sort=updated&updated=%3C%3D1619567999');
 
       cy.algoliaQueryRequest()
         .get('[data-cy=chip-filter]')
@@ -146,7 +146,7 @@ describe('Filter last updated', () => {
     });
 
     it('Applying "start date" and "to date" using the URL filters books that were modified in between', () => {
-      cy.visit('/?updated=%3E%3D1617235200%26%26%3C%3D1617407999');
+      cy.visit('/?sort=updated&updated=%3E%3D1617235200%26%26%3C%3D1617407999');
 
       cy.algoliaQueryRequest()
         .get('[data-cy=chip-filter]')
@@ -170,7 +170,7 @@ describe('Filter last updated', () => {
     });
 
     it('Removing chip will remove the date filter', () => {
-      cy.visit('/?updated=%3C%3D1619567999');
+      cy.visit('/?sort=updated&updated=%3C%3D1619567999');
 
       cy.get('@toLastUpdated').should('contain.value', 'April 27, 2021');
 
diff --git a/e2e/integration/pagination.spec.js b/e2e/integration/pagination.spec.js
@@ -63,14 +63,14 @@ describe('Pagination', () => {
     });
 
     it('Set page using URL',() => {
-      cy.visit('/?p=2');
+      cy.visit('/?sort=updated&p=2');
       cy.algoliaQueryRequest('algoliaRequest')
         .get(Elements.paginatorLink(2)).should('have.class','font-bold');
       cy.get('@firstBookTitle').contains('Physics 103 and 104 Teaching Guide');
     });
 
     it('Set page and search term using URL',() => {
-      cy.visit('/?p=2&q=biology');
+      cy.visit('/?sort=updated&p=2&q=biology');
       cy.algoliaQueryRequest('algoliaRequest');
       cy.get(Elements.paginatorLink(2)).should('have.class','font-bold');
       cy.get('@firstBookTitle').contains('A Mixed Course-Based Research Approach to Human Physiology');
diff --git a/e2e/integration/perPage.spec.js b/e2e/integration/perPage.spec.js
@@ -25,7 +25,7 @@ describe('Books per page', () => {
     it('Changes the amount of books displayed when requested by URL', () => {
       [20, 50].forEach(length => {
         cy.intercept('**/indexes/*/queries?*').as(`listing${length}`);
-        cy.visit(`/?per_page=${length}`);
+        cy.visit(`/?sort=updated&per_page=${length}`);
         cy.algoliaQueryRequest('listing');
         cy.wait(`@listing${length}`).then(() => {
           cy.get('[data-cy=book-card]').should('have.length', length);
diff --git a/e2e/integration/search.spec.js b/e2e/integration/search.spec.js
@@ -16,7 +16,7 @@ describe('Search', () => {
 
       cy.get('[data-cy=book-card]').should('have.length', 2);
       cy.url()
-        .should('include','?q=math%20science');
+        .should('include','q=math%20science');
 
     });
 
@@ -41,7 +41,7 @@ describe('Search', () => {
 
       cy.get('[data-cy=book-card]').should('have.length', 2);
       cy.url()
-        .should('include','?q=math%20science');
+        .should('include','q=math%20science');
 
       cy.get(Elements.returnHomeButton).click();
 
diff --git a/e2e/integration/sortBy.spec.js b/e2e/integration/sortBy.spec.js
@@ -3,25 +3,6 @@ import {sortBy} from '../support/common';
 const { _ } = Cypress;
 describe('Sort books by', () => {
   context('Desktop resolution', () => {
-    it('Sorts by word count in descending order', () => {
-      sortBy('Word count');
-
-      cy.algoliaQueryRequest('sorting');
-
-      const toStrings = counts$ => _.map(counts$, 'textContent');
-      const toNumbers = counts => _.map(counts, Number);
-
-      cy.get('[data-cy=book-card] [data-cy=book-word-count]')
-        .then(toStrings)
-        .then(toNumbers)
-        .then(wordCounts => {
-          const sorted = _.sortBy(wordCounts).reverse();
-
-          expect(wordCounts).to.deep.equal(sorted);
-        }).url().should('include', '?sort=wordCount');;
-
-    });
-
     it('Sorts by title in ascending order', () => {
       sortBy('Title (A-Z)');
 
diff --git a/e2e/support/index.js b/e2e/support/index.js
@@ -19,7 +19,7 @@ import './commands';
 beforeEach(() => {
   cy.viewport(1280, 720);
   cy.intercept('**/indexes/*/query?*').as('fetching');
-  cy.visit('/');
+  cy.visit('/?sort=updated');
 });
 
 
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
   <head>
       <meta charset="utf-8">
       <meta http-equiv="X-UA-Compatible" content="IE=edge">
-      <meta name="description" content="Pressbooks Directory is more powerful when paired with a PressbooksEDU Authoring & Editing Platform, which allows you to clone, revise, remix, and redistribute all of the openly licensed content found through this Directory"/>
+      <meta name="description" content="Pressbooks Directory is the best place to find open educational resources (OER). Search over 2500 open textbooks and other free educational books."/>
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
       <% if (process.env.NODE_ENV === 'production') { %>
       <meta name="robots" content="index, follow" />
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pressbooks-directory",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "engines": {
     "node": ">=15.14.0",
     "npm": ">=7.0.0"
@@ -28,6 +28,7 @@
     "intro.js": "^3.4.0",
     "nprogress": "^0.2.0",
     "search-insights": "^2.0.0",
+    "v-img-fallback": "^0.1.5",
     "vue": "^2.6.12",
     "vue-clamp": "^0.3.2",
     "vue-instantsearch": "^3.6.0",
diff --git a/public/assets/images/default-book-cover.jpg b/public/assets/images/default-book-cover.jpg
diff --git a/src/components/PbBookCover.vue b/src/components/PbBookCover.vue
@@ -1,18 +1,24 @@
 <template>
   <img
+    v-img-fallback="'/assets/images/default-book-cover.jpg'"
     class="w-full"
     :src="image"
   >
 </template>
 
 <script>
+import { ImgFallback } from 'v-img-fallback';
+
 export default {
   name: 'PbBookCover',
+  directives: {
+    ImgFallback
+  },
   props: {
     image: {
       type: String,
       default: ''
     },
-  }
+  },
 };
-</script>
+</script>
diff --git a/src/store/modules/searchclient.js b/src/store/modules/searchclient.js
@@ -7,27 +7,27 @@ let sClient = {
     import.meta.env.VITE_ALGOLIA_API_READ_KEY,
     { _useRequestCache: true }
   ),
-  indexName: import.meta.env.VITE_ALGOLIA_INDEX_LAST_UPDATED_REPLICA,
+  indexName: import.meta.env.VITE_ALGOLIA_INDEX,
   availableIndexes: [
     {
-      value: import.meta.env.VITE_ALGOLIA_INDEX_LAST_UPDATED_REPLICA,
+      value: import.meta.env.VITE_ALGOLIA_INDEX,
       default: true,
-      orderedBy: 'updated',
-      isReplica: true,
-      label: 'Recently updated'
+      orderedBy: 'relevance',
+      isReplica: false,
+      label: 'Relevance'
     },
     {
-      value: import.meta.env.VITE_ALGOLIA_INDEX_WORD_COUNT_REPLICA,
+      value: import.meta.env.VITE_ALGOLIA_INDEX_LAST_UPDATED_REPLICA,
       default: false,
-      orderedBy: 'wordCount',
+      orderedBy: 'updated',
       isReplica: true,
-      label: 'Word count ↓'
+      label: 'Recently updated'
     },
     {
-      value: import.meta.env.VITE_ALGOLIA_INDEX,
+      value: import.meta.env.VITE_ALGOLIA_INDEX_ALPHABETICAL_REPLICA,
       default: false,
       orderedBy: 'name',
-      isReplica: false,
+      isReplica: true,
       label: 'Title (A-Z)'
     }
   ],
diff --git a/src/utils/cleanup.js b/src/utils/cleanup.js
@@ -1,8 +1,11 @@
 import fs from 'fs';
-export default {
+
+const cleanup = ()=>({
   name: 'cleanup',
   generateBundle() {
     if( process.env.NODE_ENV === 'production' )
-      fs.unlinkSync('./dist/robots.txt');
+      fs.unlinkSync('dist/robots.txt');
   }
-};
+});
+
+export default cleanup;
diff --git a/vite.config.js b/vite.config.js
