Deploy to Production – 2024-03-20

.github/workflows/deploy.yml

@@ -86,6 +86,7 @@ jobs:
           MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}
           MONGODB_REPLICA_SET: ${{ secrets.MONGODB_REPLICA_SET }}
           MONGODB_TRANSLATIONS_CONNECTION_STRING: ${{ secrets.MONGODB_TRANSLATIONS_CONNECTION_STRING }}
+          TRANSLATE_SUBMISSION_DATE_START: ${{ vars.TRANSLATE_SUBMISSION_DATE_START }}
           MONGODB_MIGRATIONS_CONNECTION_STRING: ${{ secrets.MONGODB_MIGRATIONS_CONNECTION_STRING }}
           GATSBY_REALM_APP_GRAPHQL_URL: ${{ secrets.GATSBY_REALM_APP_GRAPHQL_URL }}
           GATSBY_PRISMIC_REPO_NAME: ${{ vars.GATSBY_PRISMIC_REPO_NAME }}

.github/workflows/test.yml

@@ -111,6 +111,7 @@ jobs:
           MONGODB_CONNECTION_STRING: ${{ secrets.MONGODB_CONNECTION_STRING }}
           MONGODB_REPLICA_SET: ${{ secrets.MONGODB_REPLICA_SET }}
           MONGODB_TRANSLATIONS_CONNECTION_STRING: ${{ secrets.MONGODB_TRANSLATIONS_CONNECTION_STRING }}
+          TRANSLATE_SUBMISSION_DATE_START: ${{ vars.TRANSLATE_SUBMISSION_DATE_START }}
           MONGODB_MIGRATIONS_CONNECTION_STRING: ${{ secrets.MONGODB_MIGRATIONS_CONNECTION_STRING }}
           GATSBY_REALM_APP_GRAPHQL_URL: ${{ secrets.GATSBY_REALM_APP_GRAPHQL_URL }}
           GATSBY_ROLLBAR_TOKEN: ${{ secrets.GATSBY_ROLLBAR_TOKEN }}

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

@@ -579,6 +579,59 @@ describe('The Discover app', () => {
     }
   );
 
+  conditionalIt(!Cypress.env('isEmptyEnvironment'), 'Loads filters based on URL', () => {
+    cy.visit(
+      url +
+        '?is_incident_report=true&submitters=Anonymous&page=3&classifications=CSETv0%3AIntent%3AAccident'
+    );
+
+    cy.waitForStableDOM();
+
+    cy.get('form#searchForm').as('form');
+
+    cy.contains('button', 'Submitters', { timeout: 8000 })
+      .find('span.badge', { timeout: 8000 })
+      .should('contain.text', '1');
+
+    cy.get('[data-cy="Accident"]', { timeout: 8000 })
+      .should('exist')
+      .find('b')
+      .contains('CSETv0')
+      .parent()
+      .contains('Intent')
+      .should('exist')
+      .parent()
+      .contains('Accident')
+      .should('exist')
+      .parent()
+      .should('have.class', 'active');
+
+    cy.contains('button', 'Anonymous').should('have.class', 'active');
+
+    cy.contains('li.ais-Pagination-item--selected .ais-Pagination-link', '3');
+
+    cy.visit(
+      url +
+        '?authors=Christopher%20Knaus&incident_id=57&is_incident_report=true&language=en&source_domain=theguardian.com'
+    );
+
+    cy.contains('button', 'Authors', { timeout: 8000 })
+      .find('span.badge', { timeout: 8000 })
+      .should('contain.text', '1');
+
+    cy.contains('button', 'Source', { timeout: 8000 })
+      .find('span.badge', { timeout: 8000 })
+      .should('contain.text', '1');
+
+    cy.contains('button', 'Incident ID', { timeout: 8000 })
+      .find('span.badge', { timeout: 8000 })
+      .should('contain.text', '1');
+
+    cy.contains('button', 'Language', { timeout: 8000 })
+      .find('span.badge', { timeout: 8000 })
+      .should('contain.text', '1');
+  });
+
   it('Should update display types', () => {
     cy.visit(url + '?display=list');
 

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

@@ -6,7 +6,7 @@ import algoliasearch from 'algoliasearch/lite';
 import config from '../../../config';
 import { navigate } from 'gatsby';
 import { useLocalization } from 'plugins/gatsby-theme-i18n';
-import { InstantSearch } from 'react-instantsearch';
+import { Configure, InstantSearch } from 'react-instantsearch';
 import SearchBox from 'components/discover/SearchBox';
 import Hits from 'components/discover/Hits';
 import Controls from './Controls';
@@ -37,6 +37,8 @@ export default function Discover() {
 
   const [width, setWidth] = useState(0);
 
+  const [currentPage, setCurrentPage] = useState(0);
+
   const handleWindowSizeChange = useRef(
     debounce(() => {
       setWidth(window.innerWidth);
@@ -66,6 +68,15 @@ export default function Discover() {
     };
   }, []);
 
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+
+    const page = parseInt(params.get('page'), 10);
+
+    // Set the current page from the URL, defaulting to 0 (Algolia's pagination is zero-based)
+    setCurrentPage(!isNaN(page) ? page - 1 : 0);
+  }, []);
+
   if (width == 0) {
     return null;
   }
@@ -95,6 +106,7 @@ export default function Discover() {
         stateMapping: mapping(),
       }}
     >
+      <Configure hitsPerPage={28} page={currentPage} />
       <Container className="ml-auto mr-auto w-full lg:max-w-6xl xl:max-w-7xl mt-6">
         <Row className="px-0 mx-0">
           <Col className="px-0 mx-0">

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

@@ -43,6 +43,8 @@ const convertRangeToQueryString = (range) => {
 const getQueryFromState = ({ state, locale, taxa }) => {
   let query = {};
 
+  if (!state) return query;
+
   if (state.query !== '') {
     query.s = state.query;
   }

site/gatsby-site/src/components/discover/filterTypes/Classifications.js

@@ -141,7 +141,7 @@ function SelectedRefinement({ attribute }) {
     .map((item) => (
       <div
         key={item.value}
-        className="cursor-pointer border text-xs p-2 rounded-md bg-green-100 hover:bg-red-200 flex justify-between items-center"
+        className="active cursor-pointer border text-xs p-2 rounded-md bg-green-100 hover:bg-red-200 flex justify-between items-center"
         role="button"
         tabIndex={0}
         onClick={() => refine(item.value)}

site/realm/triggers/onIncidentUpdate.json

@@ -20,6 +20,48 @@
                         "$exists": false
                     }
                 }
+            ],
+            "$or": [
+                {
+                    "updateDescription.updatedFields.title": {
+                        "$exists": true
+                    }
+                },
+                {
+                    "updateDescription.updatedFields.description": {
+                        "$exists": true
+                    }
+                },
+                {
+                    "updateDescription.updatedFields.date": {
+                        "$exists": true
+                    }
+                },
+                {
+                    "updateDescription.updatedFields.\"Alleged deployer of AI system\"": {
+                        "$exists": true
+                    }
+                },
+                {
+                    "updateDescription.updatedFields.\"Alleged developer of AI system\"": {
+                        "$exists": true
+                    }
+                },
+                {
+                    "updateDescription.updatedFields.\"Alleged harmed or nearly harmed parties\"": {
+                        "$exists": true
+                    }
+                },
+                {
+                    "updateDescription.updatedFields.reports": {
+                        "$exists": true
+                    }
+                },
+                {
+                    "updateDescription.updatedFields.editors": {
+                        "$exists": true
+                    }
+                }
             ]
         },
         "project": {},
@@ -37,4 +79,4 @@
             }
         }
     }
-}
+}