gatsby-matrix-theme 22.0.3 → 23.0.0

package/CHANGELOG.md

@@ -1,3 +1,38 @@
+# [23.0.0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v22.0.3...v23.0.0) (2023-05-15)
+
+
+### Bug Fixes
+
+* updated to latest theme version ([04a6335](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/04a63353c8e7972b8fd0498cd51ca5a64affe1ab))
+
+
+### Code Refactoring
+
+* add responsible gamings ([56831e8](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/56831e8ea4aae74a8a51e4cc4ee7b9447e4cfc77))
+* add test scripts to responsible gamings ([5f53349](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5f53349fe4b3d9ac3c3e1e9b424193e16d550e57))
+* change to footer logos to comply with partnership site ([d09930b](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/d09930bfd0928133cfd6046154f7b465474d5bb2))
+* fix issue for nsa ([7e8b2e5](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/7e8b2e5a56d5f8278dc71fc63d29bd8c8ede7f07))
+* move footer logos variable ahead ([b4b2f0b](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/b4b2f0b9c0a5b18f12fe1ac7f99e48a82df37939))
+* revert temp ([fd57f7c](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/fd57f7c297f704334db63eb03a3021a02c0bc25d))
+* temp ([af2b78e](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/af2b78e197871cb7e77c0aed2c572d5ac69ee424))
+
+
+### Config
+
+* update core theme ([b0c0bb6](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/b0c0bb605888a6e06a5b43459d3f1167dcd7f56b))
+* update latest core theme ([5ff53b6](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5ff53b61c7bd53d4a4645f9acaa25c0cdea1bad8))
+
+
+* Merge branch 'tm-3395-responsible-gaming' into 'master' ([fc4681d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/fc4681d0238eb4d9a5d6162a9d2b39d6aa5266c1))
+* Merge branch 'tm-3395-responsible-gaming' into 'master' ([bb5c4d1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/bb5c4d10c4bc35cbacbf7834467e07118039bd39))
+* Merge branch 'master' into tm-3395-responsible-gaming ([655f255](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/655f255179becad16f88ff7b220143d05a07acaf))
+* Merge branch 'master' into tm-3395-responsible-gaming ([ee51b7f](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/ee51b7f0ae7685ddc64250402c5554ccbc01fdbc))
+* Merge branch 'master' into tm-3395-responsible-gaming ([4dd38b0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/4dd38b0d9c1f9598c9df77236b4b8b9a1f2526d6))
+* Merge branch 'master' into tm-3395-responsible-gaming ([343d71d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/343d71dcaa7d3e931eb07c269c231c0343314a71))
+* Merge branch 'master' into tm-3395-responsible-gaming ([2312564](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/2312564f3e24618667871ceaa52164db0c38e14a))
+* Merge branch 'master' into tm-3395-responsible-gaming ([39eb058](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/39eb058f79894ffed6a609577f76f7d62c62b351))
+* Merge branch 'master' into tm-3395-responsible-gaming ([ddef9fc](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/ddef9fcd195fc195dd4a69771ef73c589d518f2b))
+
 ## [22.0.3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v22.0.2...v22.0.3) (2023-05-12)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "22.0.3",
+  "version": "23.0.0",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@react-icons/all-files": "^4.1.0",
     "gatsby": "^4.20.0",
-    "gatsby-core-theme": "21.0.9",
+    "gatsby-core-theme": "22.0.2",
     "gatsby-plugin-sharp": "^4.10.2",
     "gatsby-plugin-sitemap": "^3.3.0",
     "gatsby-transformer-sharp": "^4.10.0",

package/src/components/molecules/footer/variants/template-one/template-one.stories.js

@@ -10,11 +10,13 @@ import {
 import { getExtraField } from 'gatsby-core-theme/src/helpers/getters';
 import MainProvider from '~context/MainProvider';
 import getFooterData from '../../../../../../tests/factories/modules/footer.factory';
+import getPageData from '../../../../../../tests/factories/pages/default.factory';
 import logo from '../../../../../../storybook-images/logo.svg';
 import securityIcon from '../../../../../../storybook-images/security.svg';
 import TemplateOne from '.';
 
 const footerData = getFooterData();
+const pageData = getPageData();
 const helpText = `
 <p>
   Gambling can be addictive, please play responsibly.
@@ -33,6 +35,17 @@ const helpText = `
 
 const phoneNum = '- 89 241 5401';
 
+const getFooterLogos = () => {
+  let refactoredFooterLogos = getExtraField(footerData?.extra_fields, 'logos');
+
+  refactoredFooterLogos = {
+    ...refactoredFooterLogos,
+    children: [...pageData?.responsibleGaming, ...refactoredFooterLogos.children],
+  };
+
+  return refactoredFooterLogos;
+};
+
 export default {
   title: 'Matrix-Theme/Layout/Footer/Template One',
   component: TemplateOne,
@@ -40,7 +53,7 @@ export default {
     footerLogos: {
       name: 'footerLogos',
       type: { name: 'object', required: true },
-      defaultValue: getExtraField(footerData?.extra_fields, 'logos'),
+      defaultValue: getFooterLogos(),
       description: 'footer logos',
     },
     footerMenu: {

package/src/gatsby-core-theme/components/molecules/footer/footer.test.js

@@ -4,6 +4,7 @@ import '@testing-library/jest-dom/extend-expect';
 import '~tests/helpers/match-media.mock';
 import Footer from '.';
 import getFooterData from '../../../../../tests/factories/modules/footer.factory';
+import getPageData from '../../../../../tests/factories/pages/default.factory';
 
 describe('header component', () => {
   test('render', async () => {
@@ -63,6 +64,22 @@ describe('header component', () => {
       expect(container.querySelectorAll('.footer.templateThree')).toHaveLength(0);
     });
   });
+  test('Test new responsible gaming logos', async () => {
+    const { container } = render(
+      <Footer section={getFooterData()} template="homepage" page={getPageData()} />
+    );
+
+    await waitFor(() => {
+      expect(container.querySelectorAll('.footer .logos li')).toHaveLength(6);
+    });
+  });
+  test('Test when new responsible gaming logos are not available', async () => {
+    const { container } = render(<Footer section={getFooterData()} template="homepage" />);
+
+    await waitFor(() => {
+      expect(container.querySelectorAll('.footer .logos li')).toHaveLength(3);
+    });
+  });
 });
 afterEach(() => {
   cleanup();

package/src/gatsby-core-theme/components/molecules/footer/index.js

@@ -43,11 +43,30 @@ const Footer = (props) => {
   </p>`;
   const phoneNum = '- 89 241 5401';
 
+  const footerLogos = getExtraField(props.section?.extra_fields, 'logos');
+
+  const getFooterLogos = () => {
+    let refactoredFooterLogos = { children: [] };
+
+    if (footerLogos === null) {
+      refactoredFooterLogos = {
+        children: [...props.page?.responsibleGaming],
+      };
+    } else {
+      refactoredFooterLogos = {
+        ...footerLogos,
+        children: [...props.page?.responsibleGaming, ...footerLogos.children],
+      };
+    }
+
+    return refactoredFooterLogos;
+  };
+
   props = {
     ...props,
     showLinks: props.template !== 'ppc',
     copyrightDisclaimer: getExtraField(props.section?.extra_fields, 'copyright_disclaimer'),
-    footerLogos: getExtraField(props.section?.extra_fields, 'logos'),
+    footerLogos: props.page?.responsibleGaming?.length ? getFooterLogos() : footerLogos,
     hasDisclaimer: true,
     showCopyright: true,
     footerMenu: getExtraField(props.section?.extra_fields, 'links'),