gatsby-matrix-theme 7.1.53 → 7.1.56

package/.ci.yml

@@ -21,9 +21,9 @@ Matrix Theme Test:
       - coverage/
   coverage: /All files\s*\|\s*([\d\.]+)/
   rules:
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
-    - if: '$CI_COMMIT_BRANCH == "master" && $PIPELINE == "automated"'
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $PIPELINE == "automated"'
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta"'
+    - if: '($CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "beta") && $PIPELINE == "automated"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
 
 Theme Publish:
   image: git.ilcd.rocks:4567/team-floyd/themes/gatsby-themes:node14
@@ -48,5 +48,25 @@ Theme Publish:
     variables:
       - $PIPELINE != "content-trigger"
 
+Theme Beta Publish:
+  image: git.ilcd.rocks:4567/team-floyd/themes/gatsby-themes:node14
+  stage: publish-beta
+  tags:
+    - floyd-runner-test
+  before_script:
+    - git config --global http.sslverify false
+    - git config --global user.email "floyd@gig.com"
+    - git config --global user.name "floyd"
+  script:
+    - export HUSKY=0
+    - yarn config set cache-folder .yarn
+    - yarn
+    - cd matrix-theme/
+    - npx semantic-release
+  when: manual
+  only:
+    refs:
+      - beta
+
 variables:
   PIPELINE: automated

package/CHANGELOG.md

@@ -1,3 +1,48 @@
+## [7.1.56](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v7.1.55...v7.1.56) (2022-08-31)
+
+
+### Bug Fixes
+
+* added prop for copyright in footer ([cdbfcee](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/cdbfcee0a89c18019afd50cf5f4d487ca0bfc666))
+* fixed conflict ([97b28db](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/97b28db2b647776acdddf661ede28596c83fbde1))
+* updated core version ([6a790ef](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/6a790ef737e038310531f86506cd19f0d92569d5))
+
+## [7.1.55](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v7.1.54...v7.1.55) (2022-08-29)
+
+
+### Bug Fixes
+
+* added a new state to check when the newsletter button is clicked ([043d063](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/043d0639cf5f3be317e73b8b68d8fc4544b6dad6))
+* added link to provider name if the game relation has an existing page ([3ff6006](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/3ff60060244d8f4efc471dc56062976105539a3e))
+* build issues ([9d576a1](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/9d576a129c0e20d21b1599078111ca651260671b))
+* changed the content-intro component to use the content module ([e0ee58d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/e0ee58dc4e3fa2b46d01fe6004a17653785c747a))
+* fixed load more button ([c6de753](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/c6de753ac0b744d2c9d1e952765b121faa20cfe2))
+* merged master ([05515fa](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/05515fae41e5c9064234098fd454fdafd4b147cc))
+* tests ([ef69bcb](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/ef69bcb0dc63a0c16f9f8cae17688ad5dfd0efdf))
+* toplist variant one ([328d331](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/328d3315eac8d4d3fe559ac3b8b2d807da4eed46))
+* updated core theme version ([20f3fd4](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/20f3fd431d020a3f7d9b24677c5b4cd6752e7057))
+
+
+* Merge branch 'tm-2781-linking-provider-name' into 'master' ([095f727](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/095f727fd5bf86369707bbe37ce1ef4e013cdcf9))
+* Merge branch 'tm-3041-load-more-fix' into 'master' ([5bd36b5](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5bd36b5019f83087866737cda4b838e60198c5e1))
+* Merge branch 'tm-3037-module-intro' into 'master' ([beaa6f3](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/beaa6f3795ee75a9264c82efb407b6fa025bbd37))
+* Merge branch 'tm-3039-icon/button-fuctionality-issue' into 'master' ([eb28f59](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/eb28f59219d9c5a6b3add86ebacfeb1d9a526e71))
+
+## [7.1.54](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v7.1.53...v7.1.54) (2022-08-24)
+
+
+### Bug Fixes
+
+* added react-helmet ([43ce9b8](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/43ce9b8b6f139965d6c104720b1a5b7440fd39d3))
+* added react-helmet ([97a218d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/97a218d39053cd57a4deefc97cb39e59ad6a924f))
+* pipelines ([36ea0f0](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/36ea0f077858c8cd7226087d227fe931a3a8aaa7))
+* pipelines ([5c07a87](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/5c07a878dddfc17445565bafc1ef58247bfcd798))
+* updated to latest official core version ([3ebfd4d](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/3ebfd4dabae0a0408487855cb5bf094b26e0366e))
+* upgrade gatsby and react ([98f77c4](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/98f77c4c32f3f2504f9a0f39f0e113c051d054b7))
+
+
+* Merge branch 'tm-2987-gatsby-upgrade' into 'master' ([64e4558](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/commit/64e4558953f24c499e83d033b5b849473617f532))
+
 ## [7.1.53](https://git.ilcd.rocks/team-floyd/themes/matrix-theme/compare/v7.1.52...v7.1.53) (2022-08-22)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-matrix-theme",
-  "version": "7.1.53",
+  "version": "7.1.56",
   "main": "index.js",
   "description": "Matrix Theme NPM Package",
   "author": "",
@@ -23,13 +23,14 @@
     "url": "https://storybook-matrix.gigmedia.com/"
   },
   "dependencies": {
-    "gatsby": "^4.17.0",
-    "gatsby-core-theme": "^11.0.0",
+    "gatsby": "^4.20.0",
+    "gatsby-core-theme": "11.0.5",
     "gatsby-plugin-sharp": "^4.10.2",
     "gatsby-plugin-sitemap": "^3.3.0",
     "gatsby-transformer-sharp": "^4.10.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "@react-icons/all-files": "^4.1.0"
   },
   "devDependencies": {
     "@babel/core": "^7.13.1",

package/src/components/atoms/cards/game-card/index.js

@@ -87,7 +87,15 @@ const GameCard = ({
           <span className={styles.cardTitle}>{title}</span>
         </Link>
         <div className={styles.cardMeta}>
-          <div className={styles.cardProvider}>{relation && relation?.game_provider?.name}</div>
+          {relation &&
+            (relation?.game_provider.name && relation?.game_provider.path ? (
+              <Link to={relation.game_provider.path} className={styles.cardProvider}>
+                {relation.game_provider.name}
+              </Link>
+            ) : (
+              <div className={styles.cardProvider}>{relation.game_provider.name}</div>
+            ))}
+
           <div className={styles.cardRating}>
             {relation && (
               <StarRating
@@ -116,7 +124,7 @@ GameCard.propTypes = {
       second_rating: PropTypes.string,
       third_rating: PropTypes.string,
       fourth_rating: PropTypes.string,
-      game_provider: PropTypes.shape({ name: PropTypes.string }),
+      game_provider: PropTypes.shape({ name: PropTypes.string, path: PropTypes.string }),
       thumbnail_filename_object: PropTypes.shape({
         alt: PropTypes.string,
       }),

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

@@ -14,6 +14,7 @@ import styles from './newsletter.module.scss';
 
 const Newsletter = ({ page, openBtnText = 'Unlock Bonuses', footer = false }) => {
   const [toggleNewsetter, setToggleNewsletter] = useState(false);
+  const [isClicked, setIsClicked] = useState(false);
   const { translations } = useContext(Context) || {};
   const redirectUrl =
     page?.path === '/'
@@ -23,6 +24,11 @@ const Newsletter = ({ page, openBtnText = 'Unlock Bonuses', footer = false }) =>
   const newsletterFloatingContainer = useRef(React.createRef());
   const ppcPage = page.template === 'ppc';
 
+  const statesCombined = () => {
+    setToggleNewsletter(!toggleNewsetter);
+    setIsClicked(true);
+  };
+
   return (
     <div
       ref={newsletterFloatingContainer}
@@ -32,7 +38,8 @@ const Newsletter = ({ page, openBtnText = 'Unlock Bonuses', footer = false }) =>
         <Button
           active={!toggleNewsetter}
           text={translate(translations, 'newsletter_open_btn', openBtnText)}
-          toggleNewsLetter={() => setToggleNewsletter(!toggleNewsetter)}
+          toggleNewsLetter={statesCombined}
+          isClicked={isClicked}
           gtmClass="newsletter-gtm btn-cta"
           ppcPage={ppcPage}
         />

package/src/components/molecules/toplist/row/variant-one.js

@@ -1,3 +1,4 @@
+/* eslint-disable react/prop-types */
 /* eslint-disable import/no-extraneous-dependencies */
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
@@ -27,11 +28,13 @@ export default function Row({
   oneliner = 'main',
   layout = 'list',
   number = 1,
+  index,
   activeAuthor = false,
   isPPC = false,
   showLaunchDate = true,
   showCtaReviewLink = false,
   className,
+  itemRefs,
 }) {
   const result = item.authorName?.split(/\s+/);
   const itemName = item.bonus?.operator_name || item.name;
@@ -55,11 +58,18 @@ export default function Row({
   const ribbons = hasRibbon?.split(',');
   const launchDate = getLaunchDate(item.founded);
 
+  const addToRefs = (el, itemNum) => {
+    if (el && itemRefs) {
+      itemRefs.current[itemNum] = el;
+    }
+  };
+
   return (
     <li
       className={`${className} ${styles.row} ${layout === 'grid' ? styles.grid : ''} ${
         showLaunchDate ? styles.launchDate : ''
       } ${!tandcEnabled ? styles.rowNoTandC : ''}`}
+      ref={(el) => addToRefs(el, index)}
     >
       {layout === 'grid' && (
         <div className={`${styles.numbers} ${styles[`num_${number}`]}`} id={`num_${number}`}>
@@ -168,6 +178,7 @@ export default function Row({
 
 Row.propTypes = {
   showLaunchDate: PropTypes.bool,
+  index: PropTypes.number,
   activeAuthor: PropTypes.bool,
   className: PropTypes.string,
   tracker: PropTypes.string,

package/src/components/molecules/toplist/row/variant-one.test.js

@@ -8,7 +8,7 @@ import Row from './variant-one';
 describe('toplist row component', () => {
   test('render row list format', () => {
     const { container, getAllByText, getByText } = render(
-      <Row item={getToplistItem()} tracker="main" />
+      <Row item={getToplistItem()} tracker="main" itemRefs={{ current: {} }} />
     );
     expect(container).toBeTruthy();
 
@@ -38,7 +38,7 @@ describe('toplist row component', () => {
 
   test('render row grid format', () => {
     const { container, getAllByText, getByText } = render(
-      <Row layout="grid" item={getToplistItem()} tracker="main" />
+      <Row layout="grid" item={getToplistItem()} itemRefs={{ current: {} }} tracker="main" />
     );
     expect(container).toBeTruthy();
 
@@ -76,7 +76,7 @@ describe('toplist row component', () => {
       },
       review_link: null,
     };
-    const { getByText } = render(<Row item={updateObj} />);
+    const { getByText } = render(<Row itemRefs={{ current: {} }} item={updateObj} />);
     expect(getByText('ribbon_text')).toBeTruthy();
     expect(getByText('pro1')).toBeTruthy();
   });

package/src/gatsby-core-theme/components/atoms/module-title/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 /* eslint-disable import/no-extraneous-dependencies */
 import React, { useContext } from 'react';
 import PropTypes from 'prop-types';
@@ -79,10 +80,9 @@ const ModuleTitle = ({ module, viewMoreIcon = <FaAngleRight />, pageContext = nu
 
   const template = pageContext && pageContext?.page?.template;
   const type = pageContext && pageContext?.page?.type;
-  return (
-    (module.module_title ||
-      (module.title && (module.name === 'cards' || module.name === 'top_list'))) &&
-    (module.link_label ? (
+  return module.module_title ||
+    (module.title && (module.name === 'cards' || module.name === 'top_list')) ? (
+    module.link_label ? (
       <div
         className={`${styles.moduleTitle} ${styles[type]} ${styles[template]} ${
           module?.style && styles[module.style]
@@ -104,7 +104,9 @@ const ModuleTitle = ({ module, viewMoreIcon = <FaAngleRight />, pageContext = nu
           styles.toplistTitle
         } ${tabsToplist ? styles.tabsToplist : null}`
       )
-    ))
+    )
+  ) : (
+    <></>
   );
 };
 

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

@@ -1,4 +1,5 @@
 import React from 'react';
+// eslint-disable-next-line import/no-extraneous-dependencies
 import PropTypes from 'prop-types';
 import LinkList from 'gatsby-core-theme/src/components/molecules/link-list';
 import { getExtraField, copyrightText } from 'gatsby-core-theme/src/helpers/getters';
@@ -17,6 +18,7 @@ const Footer = ({
   page,
   hasFooterLinks = false,
   hasDisclaimer = true,
+  showCopyright = true,
 }) => {
   const TopSection = footerTopCustom;
   const BottomSection = footerBottomCustom;
@@ -33,18 +35,19 @@ const Footer = ({
 
   return (
     <footer className={`${styles.footer} ${hasFooterLinks && styles.hasFooterLinks}`}>
-      <div className={styles.topPart}>
-        <div className={styles.links}>
+      {((footerMenu && showLinks) || footerTopCustom) && (
+        <div className={styles.topPart}>
           {footerMenu && showLinks && (
-            <LinkList
-              lists={getExtraField(section?.extra_fields, footerMenu)}
-              gtmClass="mobile-menu-gtm"
-            />
+            <div className={styles.links}>
+              <LinkList
+                lists={getExtraField(section?.extra_fields, footerMenu)}
+                gtmClass="mobile-menu-gtm"
+              />
+            </div>
           )}
+          <TopSection section={section} page={page} />
         </div>
-
-        {footerTopCustom && <TopSection section={section} page={page} />}
-      </div>
+      )}
 
       <div className={styles.bottomPart}>
         {footerBottomCustom && <BottomSection section={section} page={page} />}
@@ -56,19 +59,22 @@ const Footer = ({
             }}
           />
         )}
-        <p className={styles.copyrightText}>{copyrightText()}</p>
-        <div className={styles.logos}>
-          {footerLogos && getExtraField(section?.extra_fields, footerLogos) && (
-            <LinkList
-              showListTitle={false}
-              imageOnly
-              singleList
-              lists={getExtraField(section?.extra_fields, footerLogos)}
-              gtmClass="mobile-menu-gtm logo-cta"
-            />
-          )}
-          {hasDisclaimer && <Disclaimer image={dmcaImg} />}
-        </div>
+        {showCopyright && <p className={styles.copyrightText}>{copyrightText()}</p>}
+
+        {(footerLogos || hasDisclaimer) && (
+          <div className={styles.logos}>
+            {footerLogos && getExtraField(section?.extra_fields, footerLogos) && (
+              <LinkList
+                showListTitle={false}
+                imageOnly
+                singleList
+                lists={getExtraField(section?.extra_fields, footerLogos)}
+                gtmClass="mobile-menu-gtm logo-cta"
+              />
+            )}
+            {hasDisclaimer && <Disclaimer image={dmcaImg} />}
+          </div>
+        )}
       </div>
     </footer>
   );
@@ -97,4 +103,5 @@ Footer.propTypes = {
   page: PropTypes.object,
   hasFooterLinks: PropTypes.bool,
   hasDisclaimer: PropTypes.bool,
+  showCopyright: PropTypes.bool,
 };

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

@@ -114,7 +114,7 @@ const Modules = ({ module, page, pageContext }) => {
   const ModuleIntro =
     module.name !== 'top_list' &&
     module.module_introduction &&
-    loadable(() => import('~molecules/content-intro'));
+    loadable(() => import('~molecules/content'));
 
   return (
     ModuleComponent && (
@@ -126,7 +126,7 @@ const Modules = ({ module, page, pageContext }) => {
         } ${styles.module} ${module?.style && styles[module.style]} module`}
       >
         {module.name !== 'top_list' && <ModuleTitle module={module} />}
-        {ModuleIntro && <ModuleIntro content={module.module_introduction} />}
+        {ModuleIntro && <ModuleIntro module={{ value: module.module_introduction }} />}
         <ModuleComponent module={module} page={page} pageContext={pageContext} {...extraProps} />
       </div>
     )

package/src/gatsby-core-theme/components/organisms/toplist/list/index.js

@@ -33,29 +33,19 @@ export default function List({
     items = items.filter((res) => res.status !== 'inactive');
   }
 
-  const addToRefs = (el, index) => {
-    if (el) {
-      elRefs.current[index] = el;
-    }
-  };
-
   const loadMoreBtn = useRef(React.createRef());
 
   const showLoadMoreButton =
     hasLoadMoreButton === '1' && Number(initItemsCount) < toplist.items.length;
 
   function handleClick() {
-    const displayed = elRefs.current.filter((item) =>
-      item.base.classList.contains(styles.show)
-    ).length;
+    const displayed = elRefs.current.filter((item) => item.classList.contains(styles.show)).length;
 
     const nextItem = loadingItems + displayed;
     const lastItem =
       nextItem > elRefs.current.length ? elRefs.current.length + 1 : displayed + loadingItems;
 
-    elRefs.current
-      .slice(displayed, lastItem)
-      .forEach((item) => item.base.classList.toggle(styles.show));
+    elRefs.current.slice(displayed, lastItem).forEach((item) => item.classList.toggle(styles.show));
     forceCheck();
 
     if (loadingItems + displayed >= elRefs.current.length) {
@@ -79,10 +69,15 @@ export default function List({
               index={index}
               className={index + 1 <= initLoadItems ? styles.show : null}
               key={keygen()}
-              ref={(el) => addToRefs(el, index)}
+              itemRefs={elRefs}
             />
           ) : (
-            <Row item={item} tracker={toplist.tracker} oneliner={toplist.one_liner} />
+            <Row
+              itemRefs={elRefs}
+              item={item}
+              tracker={toplist.tracker}
+              oneliner={toplist.one_liner}
+            />
           )
         )}
       </ul>
@@ -95,7 +90,7 @@ export default function List({
             onClick={handleClick}
             invertColors
             primaryColor={false}
-            gtmClass="toplist-gtm btn-cta"
+            gtmClass="toplist-gtm-load-more btn-cta"
           />
         </div>
       )}

package/src/gatsby-core-theme/components/organisms/toplist/list/list.test.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import { render, cleanup, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import { singleToplistData } from 'gatsby-core-theme/tests/factories/modules/toplist.factory';
+import List from './index';
+import Row from '../../../../../components/molecules/toplist/row/variant-one';
+
+const module = singleToplistData;
+
+describe('List test component', () => {
+  test('render', () => {
+    const { container } = render(
+      <List
+        CustomRow={Row}
+        hasLoadMoreButton="1"
+        initItemsCount="2"
+        loadItemsCount="2"
+        toplist={module.items[0]}
+      />
+    );
+
+    expect(container.getElementsByClassName('show').length).toBe(2);
+    const loadMoreButton = container.querySelector('button.toplist-gtm-load-more');
+    fireEvent.click(loadMoreButton);
+
+    expect(container.getElementsByClassName('show').length).toBe(4);
+  });
+});
+afterEach(() => {
+  cleanup();
+});

package/src/hooks/tabs/index.js

@@ -103,8 +103,7 @@ const Tabs = ({
     setTimeout(forceCheck);
   }
 
-  const ModuleIntro =
-    module.module_introduction && loadable(() => import('~molecules/content-intro'));
+  const ModuleIntro = module.module_introduction && loadable(() => import('~molecules/content'));
 
   return (
     <>
@@ -131,7 +130,7 @@ const Tabs = ({
 
         {HeaderComp && <div className={styles.headerComp}>{HeaderComp}</div>}
       </div>
-      {ModuleIntro && <ModuleIntro content={module.module_introduction} />}
+      {ModuleIntro && <ModuleIntro module={{ value: module.module_introduction }} />}
       <div className="tab-content">
         {children.map((child, index) => {
           if (

package/storybook/.ci.yml

@@ -16,9 +16,9 @@ Storybook Build:
     paths:
       - matrix-theme/storybook/public/
   rules:
-    - if: '$CI_COMMIT_BRANCH == "master" && $PIPELINE == "automated"'
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $PIPELINE == "automated"'
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $PIPELINE == "automated"'
+    - if: '($CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "beta") && $PIPELINE == "automated"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
+    - if: '($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
     - if: '$PIPELINE == "development"'
 
 
@@ -42,9 +42,9 @@ Storybook Deploy:
       - matrix-theme/node_modules/
     policy: pull
   rules:
-    - if: '$CI_COMMIT_BRANCH == "master" && $PIPELINE == "automated"'
-    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $PIPELINE == "automated"'
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" && $PIPELINE == "automated"'
+    - if: '($CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "beta") && $PIPELINE == "automated"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
+    - if: '($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "beta") && $PIPELINE == "automated"'
       when: manual
       allow_failure: true
     - if: '$PIPELINE == "development"'