gatsby-core-theme 28.0.2 → 28.0.4

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [28.0.4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v28.0.3...v28.0.4) (2023-08-28)
+
+
+### Bug Fixes
+
+* issearchPath helper ([d7d0d52](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d7d0d52c08a9b65b31759a1d6343b69ce014b67b))
+
+## [28.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v28.0.2...v28.0.3) (2023-08-28)
+
+
+### Bug Fixes
+
+* added translations ([cc10ed3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/cc10ed37d43e4efa1b269c6c87ea77e639af16bb))
+* archive buttons translations ([5929177](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/59291770f76274c090fef607f60da1d196473f44))
+* update search module ([d91edad](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/d91edadb13dde8da16bb03e701a21fb9ffc343ce))
+
+
+* Merge branch 'tm-3533-enable-search-for-multiple-market' into 'master' ([8e97e7f](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/8e97e7fa1357c4ba9baa3a65744b038ef6729e06))
+* Merge branch 'tm-3642-pagination-translations' into 'master' ([7664773](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/76647734b8de7da16bb1a2b91bfc4d8ef19db18c))
+
 ## [28.0.2](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v28.0.1...v28.0.2) (2023-08-24)
 
 

package/gatsby-node.mjs

@@ -7,8 +7,8 @@
 import loadash from 'lodash/index.js';
 import chalk from 'chalk';
 import fs from 'fs';
-import { dirname } from "path"
-import { fileURLToPath } from "url"
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
 import { getData, getLocalData } from './src/helpers/api.mjs';
 
 import { generateTrackerLink } from './src/helpers/generators.mjs';
@@ -17,8 +17,7 @@ import { pickAuthorsPageKeys } from './src/constants/pick-keys.mjs';
 import { translate } from './src/helpers/getters.mjs';
 import { groupBy } from './src/helpers/processor/common.mjs';
 
-
-const __dirname = dirname(fileURLToPath(import.meta.url))
+const __dirname = dirname(fileURLToPath(import.meta.url));
 const { cloneDeep, chunk, pick } = loadash;
 
 const isPreview = process.env.GATSBY_PREVIEW_MODE === 'true';
@@ -85,7 +84,11 @@ function createArchivePage(pageObject, marketSections, prefilledModules, createP
             page.path = pageObject.path;
             break;
           default:
-            page.path = `${pageObject.path}/page/${archive.currentPage}`;
+            page.path = `${pageObject.path}/${translate(
+              translations,
+              'archive_page_path',
+              'page'
+            )}/${archive.currentPage}`;
             page.meta_title += translate(
               translations,
               'archive_title_suffix',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "28.0.2",
+  "version": "28.0.4",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "directories": {

package/src/components/molecules/pagination/index.js

@@ -1,9 +1,10 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useContext } from 'react';
 import PropTypes from 'prop-types';
-
+import { translate } from '~helpers/getters';
 import Link from '~hooks/link';
 import styles from './pagination.module.scss';
 import keygen from '~helpers/keygen';
+import { Context } from '~context/MainProvider';
 
 const Pagination = ({
   currentPage = 1,
@@ -16,10 +17,12 @@ const Pagination = ({
   anchorLabel,
 }) => {
   const numOfItemsEachSide = Math.ceil(numOfItems / 2);
-
+  const { translations } = useContext(Context) || {};
   function getPagePath(index) {
     return (
-      (index === 1 ? pagePath : `${pagePath}/page/${index}`) +
+      (index === 1
+        ? pagePath
+        : `${pagePath}/${translate(translations, 'archive_page_path', 'page')}/${index}`) +
       (anchorLabel ? `#${anchorLabel}` : '')
     );
   }
@@ -59,8 +62,12 @@ const Pagination = ({
       {/* previous button */}
       {currentPage !== 1 && (
         <li>
-          <Link to={getPagePath(currentPage - 1)} className="pagination-gtm">
-            {previousText}
+          <Link
+            to={getPagePath(currentPage - 1)}
+            className="pagination-gtm"
+            aria-label={translate(translations, 'archive_previous_button', previousText)}
+          >
+            {translate(translations, 'archive_previous_button', previousText)}
           </Link>
         </li>
       )}
@@ -87,8 +94,12 @@ const Pagination = ({
       {/* next button */}
       {currentPage < totalPages && (
         <li>
-          <Link to={getPagePath(currentPage + 1)} className="pagination-gtm">
-            {nextText}
+          <Link
+            to={getPagePath(currentPage + 1)}
+            className="pagination-gtm"
+            aria-label={translate(translations, 'archive_next_button', nextText)}
+          >
+            {translate(translations, 'archive_next_button', nextText)}
           </Link>
         </li>
       )}

package/src/components/molecules/pagination/with-midpoints.js

@@ -25,7 +25,9 @@ const PaginationWithMidPoints = ({
   const total = Number(totalPages);
   function getPagePath(index) {
     return (
-      (index === 1 ? pagePath : `${pagePath}/page/${index}`) +
+      (index === 1
+        ? pagePath
+        : `${pagePath}/${translate(translations, 'archive_page_path', 'page')}/${index}`) +
       (anchorLabel ? `#${anchorLabel}` : '')
     );
   }
@@ -47,7 +49,7 @@ const PaginationWithMidPoints = ({
           <Link
             to={getPagePath(1)}
             className={`${styles.button || ''} ${styles.isActive || ''} pagination-gtm`}
-            aria-label="Go to First Page"
+            aria-label={translate(translations, 'archive_go_to_first_page', 'Go to first page')}
           >
             {firstComp}
           </Link>
@@ -61,7 +63,7 @@ const PaginationWithMidPoints = ({
           <Link
             to={getPagePath(current - 1)}
             className={`${styles.button || ''} ${styles.isActive || ''} pagination-gtm`}
-            aria-label="Previous Button"
+            aria-label={translate(translations, 'archive_previous_button', 'Previous Button')}
           >
             {previousComp}
           </Link>
@@ -145,7 +147,7 @@ const PaginationWithMidPoints = ({
           <Link
             to={getPagePath(current + 1)}
             className={`${styles.button || ''} ${styles.isActive || ''} pagination-gtm`}
-            aria-label="Next Button"
+            aria-label={translate(translations, 'archive_next_button', 'Next Button')}
           >
             {nextComp}
           </Link>
@@ -159,7 +161,7 @@ const PaginationWithMidPoints = ({
           <Link
             to={getPagePath(total)}
             className={`${styles.button || ''} ${styles.isActive || ''} pagination-gtm`}
-            aria-label="Go to Last"
+            aria-label={translate(translations, 'archive_go_to_last_page', 'Go to Last')}
           >
             {lastComp}
           </Link>
@@ -179,6 +181,7 @@ PaginationWithMidPoints.propTypes = {
   previousComp: PropTypes.oneOfType([PropTypes.element, PropTypes.any]),
   firstComp: PropTypes.oneOfType([PropTypes.element, PropTypes.any]),
   lastComp: PropTypes.oneOfType([PropTypes.element, PropTypes.any]),
+  anchorLabel: PropTypes.string,
 };
 
 export default PaginationWithMidPoints;

package/src/components/molecules/search/index.js

@@ -81,19 +81,19 @@ const Search = ({
           const types = getChildrenTypes();
           let filteredResults = [];
 
-          searchResultsRef.current.forEach((object) => {
-            if (object.relation && object.relation.market === pageContext.page?.market) {
-              filteredResults = [
-                ...filteredResults,
-                ...searchResultsRef.current.filter(filterByKey('id', object.id)),
-              ];
-            }
-          });
-
           types.forEach((type) => {
             filteredResults = [
               ...filteredResults,
-              ...searchResultsRef.current.filter(filterByKey('type', type)),
+              ...searchResultsRef.current.filter((object) => {
+                if (
+                  object.relation &&
+                  object.relation.market === pageContext.page?.market &&
+                  object.type === type
+                ) {
+                  return true;
+                }
+                return false;
+              }),
             ];
           });
 

package/src/components/pages/search/index.js

@@ -7,9 +7,10 @@ import { translate } from '~helpers/getters';
 
 const SearchContent = ({ page }) => {
   const Search = loadable(() => import('~molecules/search'));
-
+  const searchURLPageName = page.path;
   return (
     <Search
+      searchURLPageName={searchURLPageName}
       page={page}
       pageSearchOptions={{
         useArchive: true,

package/src/helpers/isSearchPath.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line import/prefer-default-export
 export const isSearchPath = (allMarkets, pagePath) => {
   if (!allMarkets) {
-    return [];
+    return false;
   }
 
   const marketKeys = Object.keys(allMarkets);

package/src/helpers/isSearchPath.test.js

@@ -39,7 +39,7 @@ describe('isSearchPath', () => {
 
     const result = isSearchPath(allMarkets);
 
-    expect(result).toEqual([]);
+    expect(result).toEqual(false);
   });
 
   it('should return false if pagePath is null or empty', () => {