diff --git a/src/constants/dynamic-strings.js b/src/constants/dynamic-strings.js index fdadc6f1..b81c0f30 100644 --- a/src/constants/dynamic-strings.js +++ b/src/constants/dynamic-strings.js @@ -2,7 +2,7 @@ const dynamicStrings = { GLOBAL_STATE: "globalState", CUSTOM: "custom", ROUTER_LINK: "routerLink:", - TEXT_LINK: "textLink:" + MODAL_LINK: "modalLink" }; export { dynamicStrings }; \ No newline at end of file diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index 95fb1850..30255527 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -124,6 +124,9 @@ function processWidgetItemForReplacement(widgetModel, key) { if (widgetModel[key].includes(dynamicStrings.GLOBAL_STATE)) { widgetModel[key] = mapStringToState(widgetModel[key]); } + if (widgetModel[key].includes(dynamicStrings.MODAL_LINK)) { + widgetModel[key] = mapStringToModal(widgetModel[key]); + } return widgetModel[key]; } @@ -143,6 +146,18 @@ function processWidgetItemForReplacement(widgetModel, key) { return widgetModel[key]; } +function mapStringToModal(str) { + let startIndex = str.indexOf("{" + dynamicStrings.MODAL_LINK); + let linkToReplace = str.substring(startIndex, str.length); + linkToReplace = linkToReplace.substring(0, linkToReplace.indexOf("}") + 1); + + let params = linkToReplace.substring((dynamicStrings.MODAL_LINK).length + 2, linkToReplace.length -1) + let splitParams = params.split(","); + let bodyText = '' + splitParams[1] +'' + + return str.replace(linkToReplace, bodyText); +} + // Function to convert a string, into a matching global state item. function mapStringToState(str) { // Pull all matches out of the string. @@ -185,10 +200,6 @@ export function doesCopyContainRouterLink(copy) { return copy.includes(this.dynamicStrings.ROUTER_LINK); } -export function doesCopyContainTextLink(copy) { - return copy.includes(this.dynamicStrings.TEXT_LINK); -} - export function splitCopyOnCMSPlaceHolder(copy) { // splits copy on { ... } such as {routerlink: ...} return copy.split(/{(.*?)}/g); diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index a80cc341..7778c6e6 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -18,45 +18,12 @@
+ >