From e903a62c51eead5b03771d8a26e38dc3f4c46aab Mon Sep 17 00:00:00 2001 From: Bill Richardson Date: Wed, 2 Aug 2023 16:23:29 -0400 Subject: [PATCH] Updates to use ContentGroup --- .../site-sub-header/site-sub-header.vue | 20 +++- src/layouts/bailout-page/bailout-page.vue | 100 +++--------------- 2 files changed, 29 insertions(+), 91 deletions(-) diff --git a/src/iss-components/site-sub-header/site-sub-header.vue b/src/iss-components/site-sub-header/site-sub-header.vue index eea079d9..caa48f72 100644 --- a/src/iss-components/site-sub-header/site-sub-header.vue +++ b/src/iss-components/site-sub-header/site-sub-header.vue @@ -30,18 +30,30 @@ export default { components: { buttonBack }, props: { cmsWidgetName: String, + contentProperty: String, + darkGraySubText: Boolean, hasBackButton: Boolean, - justification: String, issContainingPage: String, - darkGraySubText: Boolean + justification: String, + stripRteStyle: Boolean, + subContentProperty: String }, emits: ['click-event'], computed: { content() { - return this.getCmsContent(this.cmsWidgetName, 'SubHeaderText'); + return this.getCmsContent(this.cmsWidgetName, this.contentProperty ?? 'SubHeaderText'); }, subText() { - const subText = this.getCmsContent(this.cmsWidgetName, 'SecondaryText'); + let subText = this.getCmsContent( + this.cmsWidgetName, + this.subContentProperty ?? 'SecondaryText' + ); + + if (this.stripRteStyle) { + const regexExp = /[\s*]style="(.*?)"/g; + subText = subText.replace(regexExp, ''); + } + return subText ?? ''; }, backButtonAccessibleText() { diff --git a/src/layouts/bailout-page/bailout-page.vue b/src/layouts/bailout-page/bailout-page.vue index 274648ff..75277424 100644 --- a/src/layouts/bailout-page/bailout-page.vue +++ b/src/layouts/bailout-page/bailout-page.vue @@ -10,9 +10,12 @@ justification="left" /> + contentProperty="HeaderText" + justification="left" + :stripRteStyle="true" + subContentProperty="BodyText" /> { vm.setCmsContent(resultMap.cmsContent); @@ -189,7 +118,7 @@ export default { }, computed: { isNoTpa() { - return false; // not sure what in the data flags this. + return true; // not sure what in the data flags this. } }, methods: { @@ -202,7 +131,6 @@ export default { }, navigateForward() {}, getBailoutPageModelFromStore() { - console.log(this.mainStore); return { firstName: this.mainStore.order.customer.firstName, lastName: this.mainStore.order.customer.lastName, @@ -232,16 +160,14 @@ $page-side-padding: 1.5rem; p { line-height: 1.5rem; + + &:last-child { + margin-bottom: 0; + } } span { font-size: 0.875rem; - - &.new-paragraph { - display: block; - margin-top: 0.25rem; - line-height: 1.5rem; - } } } }