gatsby-core-theme 41.1.0 → 41.1.2

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [41.1.2](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.1...v41.1.2) (2024-12-03)
+
+
+### Code Refactoring
+
+* get author review content from content data ([bd09c47](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/bd09c477ea3766a84f189a2751b54097767e75f4))
+
+
+* Merge branch 'multiple-contributor-author-review' into 'master' ([fe913fb](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/fe913fb7c192e7a17772c8757ef418ea7bbac300))
+
+
+### Tests
+
+* fix test ([c7626fd](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c7626fdf0269e37593ae49aa02a85d1545fdc6a2))
+
+## [41.1.1](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.1.0...v41.1.1) (2024-12-03)
+
+
+### Bug Fixes
+
+* admin bar links and preview ([c64e47d](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/commit/c64e47da86b084c33860b5d08708efcf52d0027e))
+
 # [41.1.0](https://gitlab.com/g2m-gentoo/team-floyd/themes/gatsby-themes/compare/v41.0.2...v41.1.0) (2024-12-03)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "41.1.0",
+  "version": "41.1.2",
   "description": "Gatsby Theme NPM Package",
   "author": "",
   "license": "ISC",

package/src/components/atoms/admin/bar/index.js

@@ -9,7 +9,7 @@ import PreviewLink from "./preview";
 import Logo from "./logo";
 import styles from "./bar.module.scss";
 
-const AdminBar = ({ page, marketSections, menu }) => {
+const AdminBar = ({ page, marketSections, menu, activeMarket }) => {
   const { setShowTranslationKeys, preview } = useContext(Context) || {};
   const [val, setVal] = useState(false);
   const types = ["operator", "game", "author", "payment_method"];
@@ -43,7 +43,7 @@ const AdminBar = ({ page, marketSections, menu }) => {
             </label>
           </li>
           <LayoutSection menus={menus} />
-          <PreviewLink page={page} preview={preview} />
+          <PreviewLink activeMarket={activeMarket} page={page} preview={preview} />
         </ul>
       </div>
     </div>

package/src/components/atoms/admin/bar/layout-section/index.js

@@ -11,9 +11,9 @@ const LayoutSection = ({ menus }) => {
       case "page":
         return `site-pages/${id}`;
       case "operator":
-        return `operators/${id}/sites-data?site=${process.env.GATSBY_SITE_NAME}`;
+        return `operators/${id.operator_id}/sites-data/edit/${id.id}`;
       case "game":
-        return `games/${id}/sites?site_name=${process.env.GATSBY_SITE_NAME}`;
+        return `games/${id.id}/sites?site_name=${process.env.GATSBY_SITE_NAME}`;
       case "author":
         return `site-authors/${id}`;
       case "payment_method":

package/src/components/atoms/admin/bar/preview/index.js

@@ -4,14 +4,19 @@ import { FiEye } from "@react-icons/all-files/fi/FiEye";
 import { FiEyeOff } from "@react-icons/all-files/fi/FiEyeOff";
 import styles from "./preview.module.scss";
 
-const PreviewLink = ({ page, preview }) => (
+const PreviewLink = ({ page, preview, activeMarket }) => {
+
+  const path = activeMarket && activeMarket.path_prefix ? page.path.replace(`${activeMarket.path_prefix}/`, '') : page.path;
+
+
+  return (
     <li>
       <a
         className={styles.preview}
         target={!preview ? "_blank" : ""}
         href={
           !preview
-            ? `/preview/?path=${page.path}&market_id=${page.market_id}`
+            ? `/preview/?path=${path}&market_id=${page.market_id}&market=${page.market}`
             : `/${page.path}`
         }
         rel="noreferrer"
@@ -19,12 +24,17 @@ const PreviewLink = ({ page, preview }) => (
         Preview Page {preview ? <FiEyeOff /> : <FiEye />}
       </a>
     </li>
-  );
+  )  
+};
 
 PreviewLink.propTypes = {
   page: PropTypes.shape({
     path: PropTypes.string,
     market_id: PropTypes.number,
+    market: PropTypes.string,
+  }),
+  activeMarket: PropTypes.shape({
+    path_prefix: PropTypes.string,
   }),
   preview: PropTypes.bool,
 };

package/src/components/organisms/navigation/index.js

@@ -102,6 +102,7 @@ const Navigation = ({
           page={pageContext.page}
           marketSections={pageContext.marketSections}
           menu={menu}
+          activeMarket={activeMarket}
         />
       )}
       <nav className={styles.nav || ""} ref={navRef}>

package/src/constants/admin-bar.js

@@ -73,7 +73,7 @@ export const menusConfig = (menuObj, footerSection, page, types) => [
           links: [
             {
               ...(types.includes(page?.type) && {
-                data: page?.relation?.operator_id,
+                data: page?.relation,
                 buttonText: `Edit ${page?.type} Sites Data`,
                 icon: <FiDatabase fontSize={20} />,
                 type: page?.type,

package/src/helpers/processor/page.mjs

@@ -81,7 +81,7 @@ export function generateHreflangs(page, data) {
   
         // Check if author review per page per author is available
         if (page.author_reviews && page.author_reviews[authorId]?.length) {
-          review = page.author_reviews[authorId];
+          review = data.content[page.author_reviews[authorId]];
         }
   
         return { ...author, author_review: review || "" }; // Return the author object with review or empty string

package/src/helpers/processor/page.test.js

@@ -160,30 +160,33 @@ describe("Page Helper", () => {
     ]);
   });
 
-  const pageAuthordata = {
+  const generalData = {
     authors: {
       1: { name: "Author One", bio: "Bio of Author One" },
       2: { name: "Author Two", bio: "Bio of Author Two" },
       // Non-existent author
       3: null,
     },
+    content: {
+      "66bc78a1c1dfec6dc577b0c3": "<p>In my opinion, fast payout casinos are a game-changer for players in Ireland.</p>",
+      "66bb62cdef28a6710241911b": "<h3>Can I access WinSpirit Casino from my mobile?</h3>",
+    }
   };
 
   test("returns authors when there are multiple authors", () => {
     const page = {
       authors: [1, 2],
       author_reviews: {
-        1: ["Great article!", "Very insightful!"],
-        2: [], // No reviews for Author Two
-      },
+        1: "66bc78a1c1dfec6dc577b0c3",
+      } // No reviews for Author Two
     };
 
-    const result = addMultipleAuthorsToPage(page, pageAuthordata);
+    const result = addMultipleAuthorsToPage(page, generalData);
     expect(result).toEqual([
       {
         name: "Author One",
         bio: "Bio of Author One",
-        author_review: ["Great article!", "Very insightful!"],
+        author_review: "<p>In my opinion, fast payout casinos are a game-changer for players in Ireland.</p>",
       },
       { name: "Author Two", bio: "Bio of Author Two", author_review: "" },
     ]);
@@ -193,17 +196,16 @@ describe("Page Helper", () => {
     const page = {
       authors: [1, 2, 3], // 3 is a non-existent author
       author_reviews: {
-        1: ["Great article!"],
-        2: null,
+        1: "66bc78a1c1dfec6dc577b0c3",
       },
     };
 
-    const result = addMultipleAuthorsToPage(page, pageAuthordata);
+    const result = addMultipleAuthorsToPage(page, generalData);
     expect(result).toEqual([
       {
         name: "Author One",
         bio: "Bio of Author One",
-        author_review: ["Great article!"],
+        author_review: "<p>In my opinion, fast payout casinos are a game-changer for players in Ireland.</p>",
       },
       { name: "Author Two", bio: "Bio of Author Two", author_review: "" },
     ]);
@@ -214,7 +216,7 @@ describe("Page Helper", () => {
       authors: [],
     };
 
-    const result = addMultipleAuthorsToPage(page, pageAuthordata);
+    const result = addMultipleAuthorsToPage(page, generalData);
     expect(result).toEqual([]);
   });
 
@@ -223,7 +225,7 @@ describe("Page Helper", () => {
       authors: null,
     };
 
-    const result = addMultipleAuthorsToPage(page, pageAuthordata);
+    const result = addMultipleAuthorsToPage(page, generalData);
     expect(result).toEqual([]);
   });
 
@@ -232,7 +234,7 @@ describe("Page Helper", () => {
       authors: [3], // Only non-existent author
     };
 
-    const result = addMultipleAuthorsToPage(page, pageAuthordata);
+    const result = addMultipleAuthorsToPage(page, generalData);
     expect(result).toEqual([]);
   });
 });

package/src/helpers/server-data.js

@@ -57,6 +57,7 @@ export async function getAPIData(page, url, headers, preview) {
       pagesData,
       operatorData,
       paymentData,
+      allMarketsData
     } = await fetchSiteSettings(siteName, true);
 
     const processed = processor.run(
@@ -83,7 +84,7 @@ export async function getAPIData(page, url, headers, preview) {
     );
 
     const pagePreviewProcessed = Object.values(pagesData).filter(
-      (value) => value.path === params?.path
+      (value) => (value.path === `${params?.market && allMarketsData[params?.market].path_prefix  ? `${allMarketsData[params?.market].path_prefix}/` : '' }${params?.path}`)
     );
     
     if(pagePreviewProcessed.length > 0 ) {