From a575ca628d2ce9a8d0f17df84c2e32679c336216 Mon Sep 17 00:00:00 2001 From: Jeremy Zimmerman Date: Thu, 1 Dec 2022 14:38:41 -0500 Subject: [PATCH] Updates. --- src/helpers/cms-content-helper.js | 89 ++++++++++++++++--------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index 0cc89739..079ecde7 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -6,53 +6,54 @@ export function fetchCmsContentForPage(issPage) { const clientName = store.issConfig.clientName; const pageName = issPage + (clientName.length == 0 ? "" : "_" + clientName); - return store.getPageData(pageName) - .then( - // Get the client specific page if it exists. - (response) => { return processPageData(response); }, - (error) => { - // If the client specific page does not exist, get the base page. - if ( clientName.length > 0 ) - { - return store.getPageData(issPage) - .then((response) => { - return processPageData(response); - }); - } + return store.getPageData(pageName) + .then( + // Get the client specific page if it exists. + (response) => { return processPageData(response); }, + (error) => { + // If the client specific page does not exist, get the base page. + if ( clientName.length > 0 ) + { + return store.getPageData(issPage) + .then((response) => { + return processPageData(response); + }); } - ); - } + } + ); +} - function processPageData(response) { - const pageDataFromCms = {}; - - response.data.Result.forEach((widget) => { - let widgetWithReplacements = findAndReplaceGlobalStateValues( - widget.Model, - widget.Name +// Support method for processing the page data from the CMS call. +function processPageData(response) { + const pageDataFromCms = {}; + + response.data.Result.forEach((widget) => { + let widgetWithReplacements = findAndReplaceGlobalStateValues( + widget.Model, + widget.Name + ); + + // If we already have this widget, push it on the collection + if (widgetWithReplacements.Name in pageDataFromCms) { + pageDataFromCms[widgetWithReplacements.Name].push( + widgetWithReplacements.Model ); - - // If we already have this widget, push it on the collection - if (widgetWithReplacements.Name in pageDataFromCms) { - pageDataFromCms[widgetWithReplacements.Name].push( - widgetWithReplacements.Model - ); - return; - } - - pageDataFromCms[widgetWithReplacements.Name] = [ - widgetWithReplacements.Model, - ]; - }); - - Object.keys(pageDataFromCms).forEach((key) => { - if (pageDataFromCms[key].length === 1) { - pageDataFromCms[key] = pageDataFromCms[key][0]; - } - }); - - return pageDataFromCms; - } + return; + } + + pageDataFromCms[widgetWithReplacements.Name] = [ + widgetWithReplacements.Model, + ]; + }); + + Object.keys(pageDataFromCms).forEach((key) => { + if (pageDataFromCms[key].length === 1) { + pageDataFromCms[key] = pageDataFromCms[key][0]; + } + }); + + return pageDataFromCms; +} // Parent function for processWidgetItemForReplacement. This will loop through the parent // object and pass any objects that need additional processing to the processWidgetItemForReplacement function.