gatsby-core-theme 20.0.3 → 20.0.5

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [20.0.5](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v20.0.4...v20.0.5) (2023-04-17)
+
+
+### Bug Fixes
+
+* preview function ([deb168b](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/deb168bfbfe8e5807bb2580eb46841c542506c18))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/gatsby-themes ([4776a9a](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/4776a9abd931789d4b59f42d04388fafb229703b))
+
+## [20.0.4](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v20.0.3...v20.0.4) (2023-04-17)
+
+
+### Bug Fixes
+
+* preview operator review pages ([732f8af](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/732f8afe0becc43694fa765cc00c2dc8212e938d))
+
+
+* Merge branch 'master' of git.ilcd.rocks:team-floyd/themes/gatsby-themes ([a58d979](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/commit/a58d9795a5c666083ddff3e95a4a622f9dba3d0b))
+
 ## [20.0.3](https://git.ilcd.rocks/team-floyd/themes/gatsby-themes/compare/v20.0.2...v20.0.3) (2023-04-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gatsby-core-theme",
-  "version": "20.0.3",
+  "version": "20.0.5",
   "description": "Gatsby Theme NPM Package",
   "main": "index.js",
   "GATSBY_RECAPTCHA_SITEKEY": "6LfoyvMUAAAAAO4nl_MQnqHb4XdHxEiu5cXgIqeB",

package/src/components/app.js

@@ -40,9 +40,10 @@ const App = ({ pageContext }) => {
       }
       getData(searchParams);
       globalHistory.listen(({ location }) => {
+        const searchParams2 =
+          typeof window !== 'undefined' ? new URLSearchParams(location.search) : null;
         setIsLoading(true);
-
-        getData(null, location.search.replace('?path=', ''));
+        window.location = `${window.location.origin}/preview?path=${searchParams2.get('path')}`;
       });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/src/helpers/api.js

@@ -16,10 +16,16 @@ export async function getPreview(siteName, page = null, themeOptions) {
         console.log(response);
         const processed = processor.run(response.data.result, themeOptions);
         const siteMarket = Object.keys(processed.site_markets)[0];
+
+        const pagePreview = processed.pages[siteMarket].preview[0];
+        const pagePreviewProcessed = processed.pages[siteMarket][pagePreview.relation_type].find(
+          (page) => page.path === pagePreview.path
+        );
+
         resolve({
           marketSections: processed.market_sections[siteMarket],
           prefilledModules: processed.prefilled_market_modules[siteMarket],
-          page: processed.pages[siteMarket].preview[0],
+          page: pagePreviewProcessed,
           siteInfo: processed.general,
         });
       })

package/src/helpers/getters.js

@@ -374,7 +374,7 @@ export function shiftFirstOperator(pageId, module, pagesMappedById) {
 }
 
 export const getModuleTitle = (module, page) => {
-  if (page && page.relation_type === 'operator') {
+  if (page && page.relation && page.relation_type === 'operator') {
     return (
       module.module_title && module.module_title.replace('[operator_name]', page.relation.name)
     );

package/src/helpers/processor/index.js

@@ -259,13 +259,13 @@ export default {
       prefilledMarketModules = data.prefilled_market_modules || {};
       prefilledMarketModulesRaw = cloneDeep(data.prefilled_market_modules);
       Object.keys(transformedPages[market]).forEach((pageType) => {
-        transformedPages[market][pageType].forEach(async (page, index) => {
+        transformedPages[market][pageType].forEach((page, index) => {
           // process page extra fields
           page.extra_fields && processExtraFields(page.extra_fields);
           updatePlaceholders(page, data);
 
           // set page relation
-          await processRelations(page, pageType, transformedPages, market, data, index);
+          processRelations(page, pageType, transformedPages, market, data, index);
 
           // add author object to page
           if (page.author_id !== null && data.authors[page.author_id]) {