Display Classifications filter as a tree

site/gatsby-site/config.js

@@ -201,6 +201,9 @@ const config = {
   rollbar: {
     token: process.env.GATSBY_ROLLBAR_TOKEN,
   },
+  discover: {
+    taxa: ['CSETv0', 'CSETv1', 'GMF'],
+  },
   cloudflareR2: {
     accountId: process.env.CLOUDFLARE_R2_ACCOUNT_ID,
     accessKeyId: process.env.CLOUDFLARE_R2_ACCESS_KEY_ID,

site/gatsby-site/cypress/e2e/integration/discover.cy.js

@@ -546,4 +546,32 @@ describe('The Discover app', () => {
       cy.get('div[data-cy="hits-container"]').children().should('have.length.at.least', 8);
     }
   );
+
+  conditionalIt(
+    !Cypress.env('isEmptyEnvironment'),
+    'Search using the classifications filter',
+    () => {
+      cy.visit(url);
+
+      cy.waitForStableDOM();
+
+      cy.get('[data-cy=expand-filters]').click();
+
+      cy.contains('button', 'Classifications').click();
+
+      cy.get('[data-cy="search"] input').type('Buenos Aires');
+
+      cy.get('[data-cy="attributes"] [data-cy="Named Entities"]').contains('Buenos Aires').click();
+
+      cy.waitForStableDOM();
+
+      cy.url().should('include', 'classifications=CSETv0%3ANamed%20Entities%3ABuenos%20Aires');
+
+      cy.get('[data-cy="selected-refinements"]')
+        .contains('CSETv0 : Named Entities : Buenos Aires')
+        .should('be.visible');
+
+      cy.get('div[data-cy="hits-container"]').children().should('have.length.at.least', 1);
+    }
+  );
 });

site/gatsby-site/cypress/e2e/integration/incidents/history.cy.js

@@ -149,16 +149,12 @@ describe('Incidents', () => {
   it('Should display an error message if no Incident ID is provided', () => {
     cy.visit('/incidents/history?incident_id=');
 
-    cy.waitForStableDOM();
-
     cy.contains('Invalid Incident ID').should('exist');
   });
 
   it('Should display an error message if an invalid Incident ID is provided', () => {
     cy.visit('/incidents/history?incident_id=xxx');
 
-    cy.waitForStableDOM();
-
     cy.contains('Invalid Incident ID').should('exist');
   });
 
@@ -172,7 +168,6 @@ describe('Incidents', () => {
     cy.url().should('include', '/cite/10');
   });
 
-  // wasn't able to get this one passing on github runners
   conditionalIt.skip(
     !Cypress.env('isEmptyEnvironment'),
     'Should refresh Report history if the user go back on the browser',
@@ -217,9 +212,7 @@ describe('Incidents', () => {
 
       cy.go('forward');
 
-      cy.waitForStableDOM();
-
-      cy.wait(['@FindIncidentHistory', '@FindEntities'], { timeout: 30000 });
+      cy.wait(['@FindIncidentHistory', '@FindEntities']);
     }
   );
 

site/gatsby-site/cypress/e2e/integration/integrity.cy.js

@@ -49,7 +49,7 @@ describe('Integrity', () => {
     }
   );
 
-  it.skip(
+  it(
     `is_incident_report should be true for reports assigned to incidents and vice versa`,
     { requestTimeout: 60000, defaultCommandTimeout: 60000, responseTimeout: 60000 },
     () => {
@@ -85,7 +85,7 @@ describe('Integrity', () => {
 
   it(
     `Classifications should be linked to one and only one incident`,
-    { requestTimeout: 30000, defaultCommandTimeout: 30000, responseTimeout: 30000 },
+    { requestTimeout: 60000, defaultCommandTimeout: 60000, responseTimeout: 60000 },
     () => {
       cy.query({
         query: gql`

site/gatsby-site/cypress/e2e/integration/pages.cy.js

@@ -54,7 +54,7 @@ describe('Pages', () => {
 
   paths.forEach((path) => {
     languages.forEach(({ code }) => {
-      it(`/${code}${path} Should not have errors`, () => {
+      it(`/${code}${path} Should not have errors`, { defaultCommandTimeout: 30000 }, () => {
         const canonicalPath = switchLocalizedPath({ newLang: code, path });
 
         cy.visit(canonicalPath, {
@@ -118,44 +118,50 @@ describe('Pages', () => {
             `[rel="alternate"][hrefLang="${language.hrefLang}"][href="${alternateUrl}"]`
           ).should('exist');
         }
+      });
 
-        cy.get('body')
-          .then(($body) => {
-            if ($body.find('[data-cy="cloudinary-image-wrapper"]').length) {
-              return true;
-            }
-            return false;
-          })
-          .then((selectorExists) => {
-            if (selectorExists) {
-              cy.get('[data-cy="cloudinary-image-wrapper"]').each(($el) => {
-                cy.wrap($el)
-                  .scrollIntoView()
-                  .find('[data-cy="cloudinary-image"]')
-                  .should('have.attr', 'src')
-                  .then(($src) => {
-                    cy.request({
-                      url: $src.toString(),
-                      failOnStatusCode: false,
-                    }).then((resp) => {
-                      if (resp.status !== 200) {
-                        // If image is failing, check if cloudinary image is hidden
-                        cy.wrap($el)
-                          .find('[data-cy="cloudinary-image"]')
-                          .should('have.class', 'hidden');
-                        // Check if placeholder image is displayed instead
-                        cy.wrap($el)
-                          .find('[data-cy="cloudinary-image-placeholder"]')
-                          .should('not.have.class', 'hidden');
-                      }
+      it.skip(
+        `/${code}${path} Should load images properly`,
+        { defaultCommandTimeout: 30000 },
+        () => {
+          cy.get('body')
+            .then(($body) => {
+              if ($body.find('[data-cy="cloudinary-image-wrapper"]').length) {
+                return true;
+              }
+              return false;
+            })
+            .then((selectorExists) => {
+              if (selectorExists) {
+                cy.get('[data-cy="cloudinary-image-wrapper"]').each(($el) => {
+                  cy.wrap($el)
+                    .scrollIntoView()
+                    .find('[data-cy="cloudinary-image"]')
+                    .should('have.attr', 'src')
+                    .then(($src) => {
+                      cy.request({
+                        url: $src.toString(),
+                        failOnStatusCode: false,
+                      }).then((resp) => {
+                        if (resp.status !== 200) {
+                          // If image is failing, check if cloudinary image is hidden
+                          cy.wrap($el)
+                            .find('[data-cy="cloudinary-image"]')
+                            .should('have.class', 'hidden');
+                          // Check if placeholder image is displayed instead
+                          cy.wrap($el)
+                            .find('[data-cy="cloudinary-image-placeholder"]')
+                            .should('not.have.class', 'hidden');
+                        }
+                      });
                     });
-                  });
-              });
-            } else {
-              cy.log(`No images found on page, skipping image test for path ${path}`);
-            }
-          });
-      });
+                });
+              } else {
+                cy.log(`No images found on page, skipping image test for path ${path}`);
+              }
+            });
+        }
+      );
     });
   });
 });

site/gatsby-site/cypress/e2e/unit/AlgoliaUpdater.cy.js

@@ -59,19 +59,41 @@ const reports = [
     title: 'Report 23 title',
     url: 'https://url.com/stuff',
   },
+
+  // this report hast no parent incidents
+  {
+    _id: new ObjectID('60dd465f80935bc89e6f9b07'),
+    authors: ['Test User'],
+    date_downloaded: '2019-04-13',
+    date_modified: '2020-06-14',
+    date_published: '2015-05-19',
+    date_submitted: '2019-06-01',
+    description: 'Description of report 40',
+    epoch_date_downloaded: 1555113600,
+    epoch_date_modified: 1592092800,
+    epoch_date_published: 1431993600,
+    epoch_date_submitted: 1559347200,
+    image_url: 'http://url.com',
+    cloudinary_id: 'http://cloudinary.com',
+    language: 'es',
+    report_number: 40,
+    source_domain: 'blogs.wsj.com',
+    submitters: ['Roman Yampolskiy'],
+    tags: [],
+    text: 'Report 40 **text**',
+    plain_text: 'Report 40 text',
+    title: 'Report 40 title',
+    url: 'https://url.com/stuff',
+  },
 ];
 
 const classifications = [
   {
     _id: '60dd465f80935bc89e6f9b00',
     incidents: [1],
+    reports: [],
     namespace: 'CSETv0',
     attributes: [
-      // { short_name: 'Annotator', value_json: '"1"' },
-      // { short_name: 'Annotation Status', value_json: '"6. Complete and final"' },
-      // { short_name: 'Reviewer', value_json: '"5"' },
-      // { short_name: 'Quality Control', value_json: 'false' },
-      // { short_name: 'Full Description', value_json: '"On December 5, 2018, a robot punctured."' },
       { short_name: 'Named Entities', value_json: '["Amazon"]' },
       {
         short_name: 'Harm Type',
@@ -83,7 +105,8 @@ const classifications = [
   },
   {
     _id: '60dd465f80935bc89e6f9b01',
-    incidents: [1],
+    incidents: [],
+    reports: [],
     namespace: 'SHOULD NOT BE INCLUDED',
     attributes: [{ short_name: 'Something', value_json: '"Great"' }],
     notes: 'Nothing to see here',
@@ -265,7 +288,11 @@ describe('Algolia', () => {
     });
 
     cy.wrap(updater.run()).then(() => {
-      expect(mongoClient.connect.callCount).to.eq(4);
+      expect(mongoClient.connect.callCount).to.eq(1);
+
+      // english
+
+      expect(enIndex.replaceAllObjects.getCalls().length).eq(1);
 
       expect(enIndex.replaceAllObjects.getCall(0).args[0].length).eq(2);
 
@@ -290,11 +317,16 @@ describe('Algolia', () => {
         incident_id: 1,
         epoch_incident_date: 1592092800,
         incident_date: '2020-06-14',
+        namespaces: ['CSETv0'],
         classifications: [
           'CSETv0:Named Entities:Amazon',
           'CSETv0:Harm Type:Harm to physical health/safety',
           'CSETv0:Harm Type:Harm to physical property',
         ],
+        CSETv0: {
+          'Named Entities': ['Amazon'],
+          'Harm Type': ['Harm to physical health/safety', 'Harm to physical property'],
+        },
       });
 
       expect(enIndex.replaceAllObjects.getCall(0).args[0][1]).to.deep.nested.include({
@@ -318,13 +350,29 @@ describe('Algolia', () => {
         incident_id: 1,
         incident_date: '2020-06-14',
         epoch_incident_date: 1592092800,
+        namespaces: ['CSETv0'],
         classifications: [
           'CSETv0:Named Entities:Amazon',
           'CSETv0:Harm Type:Harm to physical health/safety',
           'CSETv0:Harm Type:Harm to physical property',
         ],
+        CSETv0: {
+          'Named Entities': ['Amazon'],
+          'Harm Type': ['Harm to physical health/safety', 'Harm to physical property'],
+        },
+      });
+
+      expect(enIndex.deleteBy.getCall(0).args[0]).deep.eq({
+        filters: 'incident_id = 247',
       });
 
+      ``;
+      // spanish
+
+      expect(esIndex.replaceAllObjects.getCalls().length).eq(1);
+
+      expect(esIndex.replaceAllObjects.getCall(0).args[0].length).eq(2);
+
       expect(esIndex.replaceAllObjects.getCall(0).args[0][0]).to.deep.nested.include({
         authors: ['Alistair Barr'],
         description: 'Description of report 1',
@@ -346,11 +394,16 @@ describe('Algolia', () => {
         incident_id: 1,
         incident_date: '2020-06-14',
         epoch_incident_date: 1592092800,
+        namespaces: ['CSETv0'],
         classifications: [
           'CSETv0:Named Entities:Amazon',
           'CSETv0:Harm Type:Harm to physical health/safety',
           'CSETv0:Harm Type:Harm to physical property',
         ],
+        CSETv0: {
+          'Named Entities': ['Amazon'],
+          'Harm Type': ['Harm to physical health/safety', 'Harm to physical property'],
+        },
         featured: 0,
       });
 
@@ -375,23 +428,24 @@ describe('Algolia', () => {
         incident_id: 1,
         incident_date: '2020-06-14',
         epoch_incident_date: 1592092800,
+        namespaces: ['CSETv0'],
         classifications: [
           'CSETv0:Named Entities:Amazon',
           'CSETv0:Harm Type:Harm to physical health/safety',
           'CSETv0:Harm Type:Harm to physical property',
         ],
+        CSETv0: {
+          'Named Entities': ['Amazon'],
+          'Harm Type': ['Harm to physical health/safety', 'Harm to physical property'],
+        },
         featured: 2,
       });
 
-      expect(enIndex.deleteBy.getCall(0).args[0]).deep.eq({
-        filters: 'incident_id = 247',
-      });
-
       expect(esIndex.deleteBy.getCall(0).args[0]).deep.eq({
         filters: 'incident_id = 247',
       });
 
-      expect(mongoClient.close.callCount).to.eq(4);
+      expect(mongoClient.close.callCount).to.eq(1);
     });
   });
 });

site/gatsby-site/cypress/e2e/unit/discover/routing.cy.js

@@ -23,7 +23,7 @@ describe('Discover routing', () => {
     expect(state.refinementList).to.deep.eq({
       source_domain: ['theguardian.com'],
       authors: ['Christopher Knaus', 'Sam Levin'],
-      classifications: ['CSETv0:Intent:Accident'],
+      'CSETv0.Intent': ['Accident'],
       is_incident_report: ['true'],
     });
     expect(state.range).to.deep.eq({
@@ -40,6 +40,7 @@ describe('Discover routing', () => {
       indexName,
       locale: 'en',
       queryConfig,
+      taxa: ['CSETv0', 'CSETv1'],
     });
 
     expect('?' + resultURL).to.eq(location.search);

site/gatsby-site/src/components/discover/Discover.js

@@ -57,6 +57,8 @@ export default function Discover() {
     return null;
   }
 
+  const taxa = config.discover.taxa;
+
   return (
     <InstantSearch
       searchClient={searchClient}
@@ -69,8 +71,9 @@ export default function Discover() {
           getLocation: () => {
             return window.location;
           },
-          parseURL: ({ location }) => parseURL({ location, indexName, queryConfig }),
-          createURL: ({ routeState }) => createURL({ indexName, locale, queryConfig, routeState }),
+          parseURL: ({ location }) => parseURL({ location, indexName, queryConfig, taxa }),
+          createURL: ({ routeState }) =>
+            createURL({ indexName, locale, queryConfig, routeState, taxa }),
           push: (url) => {
             navigate(`?${url}`);
           },