diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index 30255527..36bf7c70 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -37,6 +37,7 @@ export function fetchCmsContentForPage(issPage) { }; // Support method for processing the page data from the CMS call. +// widgets = current widget collection used by page. // baseResponse = contains the widgets from the base page. // clientResponse = contains the widgets from the client override page. (null if none) function processPageData(baseResponse, clientResponse) { @@ -49,7 +50,7 @@ function processPageData(baseResponse, clientResponse) { } else { - // Overide any base widgets with the client override widgets if found. + // Override any base widgets with the client override widgets if found. baseResponse.data.Result.forEach((baseWidget) => { let found = false; clientResponse.data.Result.forEach((clientWidget) => { @@ -62,11 +63,30 @@ function processPageData(baseResponse, clientResponse) { }); if ( !found ) + { widgets.push(baseWidget); + } }); + + // Add any unique client widgets that does not exist in the current main widgets collection. + clientResponse.data.Result.forEach((clientWidget) => { + let found = false; + widgets.forEach((currentWidget) => { + + if ( clientWidget.Name == currentWidget.Name ) + { + found = true; + } + }); + + if ( !found ) + { + widgets.push(clientWidget); + } + }); } - + widgets.forEach((widget) => { // Global state value replacement. let widgetWithReplacements = findAndReplaceGlobalStateValues( diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue index 54f24fad..a092a5f1 100644 --- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue +++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue @@ -69,6 +69,7 @@ export default { z-index: 2; span { font-weight: 500; + color: $black; } }