From d8173d54bac7a8bbc7693674a04621f57a64221c Mon Sep 17 00:00:00 2001 From: Kroell Date: Thu, 2 Mar 2023 09:08:00 -0500 Subject: [PATCH 1/7] Parse modalLink in CMS --- src/constants/dynamic-strings.js | 3 ++- src/helpers/cms-content-helper.js | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/constants/dynamic-strings.js b/src/constants/dynamic-strings.js index fdadc6f1..167d72a4 100644 --- a/src/constants/dynamic-strings.js +++ b/src/constants/dynamic-strings.js @@ -2,7 +2,8 @@ const dynamicStrings = { GLOBAL_STATE: "globalState", CUSTOM: "custom", ROUTER_LINK: "routerLink:", - TEXT_LINK: "textLink:" + 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..e1f90305 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 + 1, 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. From 8b19f3045b0c59fa1a0790815aba2b2a086ee5c7 Mon Sep 17 00:00:00 2001 From: Kroell Date: Thu, 2 Mar 2023 09:13:37 -0500 Subject: [PATCH 2/7] remove code related to textLink (no longer using) --- src/constants/dynamic-strings.js | 1 - src/helpers/cms-content-helper.js | 4 ---- 2 files changed, 5 deletions(-) diff --git a/src/constants/dynamic-strings.js b/src/constants/dynamic-strings.js index 167d72a4..9943ba90 100644 --- a/src/constants/dynamic-strings.js +++ b/src/constants/dynamic-strings.js @@ -2,7 +2,6 @@ const dynamicStrings = { GLOBAL_STATE: "globalState", CUSTOM: "custom", ROUTER_LINK: "routerLink:", - TEXT_LINK: "textLink:", MODAL_LINK: "modalLink:" }; diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index e1f90305..0de5b265 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -200,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); From aa48a73e2b7de4ca9655ad68cd5701fc6efddfed Mon Sep 17 00:00:00 2001 From: Kroell Date: Thu, 2 Mar 2023 09:22:58 -0500 Subject: [PATCH 3/7] update coverage-statement page to use modalLink --- src/helpers/cms-content-helper.js | 6 +- .../coverage-statement/coverage-statement.vue | 102 ++++-------------- 2 files changed, 23 insertions(+), 85 deletions(-) diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index 0de5b265..30255527 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -151,11 +151,11 @@ function mapStringToModal(str) { let linkToReplace = str.substring(startIndex, str.length); linkToReplace = linkToReplace.substring(0, linkToReplace.indexOf("}") + 1); - let params = linkToReplace.substring((dynamicStrings.MODAL_LINK).length + 1, linkToReplace.length -1) + let params = linkToReplace.substring((dynamicStrings.MODAL_LINK).length + 2, linkToReplace.length -1) let splitParams = params.split(","); - let BodyText = '' + splitParams[1] +'' + let bodyText = '' + splitParams[1] +'' - return str.replace(linkToReplace, BodyText); + return str.replace(linkToReplace, bodyText); } // Function to convert a string, into a matching global state item. diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index a80cc341..3aaa0ebd 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -18,45 +18,12 @@
+ >
-
-
    -
  1. - - - - -
    2. -
-
-
-
-
-
+
part.requiresRecalibration).length > 0) { + return this.unverifiedADASNextStepsBodyText; + } + // if non-ADAS, display NonADASNextSteps + else { + return this.unverifiedNonADASNextStepsBodyText; + } + } + }, continueWithSchedulingBodyText() { return this.getCmsContent('continueWithSchedulingCopy', 'BodyText'); }, @@ -139,13 +107,6 @@ export default { unverifiedNonADASRepairBodyText() { return this.getCmsContent('UnverifiedNonADASRepairWidget', 'BodyText'); }, - splitADASCoverageStatementCopy() { - // Splits content when brackets are found in text so that text can be looped through and text-link can be injected when needed - return this.splitCopyOnCMSPlaceHolder(this.unverifiedADASNextStepsBodyText); - }, - arrayOfListItemsFromBodyText() { - return this.getArrayOfListItemsFromRawCmsCopy(this.unverifiedADASNextStepsBodyText); - }, damageText() { var damageString = getDamageString(); return damageString == "match" ? "" : damageString; @@ -183,29 +144,6 @@ export default { */ this.$router.navigate(this.navigationScenarios.CLICKED_BACK, this.$route); }, - displayReplaceCoverageStatement() { - // get array of parts for vehicle - let parts = useMainStore().order.lineItems.glassParts; - - // if ADAS, display ADASNextSteps - if (parts.filter(part => part.requiresRecalibration).length > 0) { - this.unverifiedADASNextSteps = true; - } - // if non-ADAS, display NonADASNextSteps - else { - this.unverifiedNonADASNextSteps = true; - } - }, - stripOlTagFromCopy(copy) { - const regex = /(?:)|(?:<\/ol>)/g; - return copy.replace(regex, ""); - }, - getArrayOfListItemsFromRawCmsCopy(copy) { - const withoutOlTags = this.stripOlTagFromCopy(copy); - return withoutOlTags - .split(/(?:)|(?:<\/li>)/g) - .filter((lineItem) => lineItem); - }, }, async forwardButtonAction() {}, resetDependentState() {}, From 93084e5adea53bdfbb31a36b68c952fc70367520 Mon Sep 17 00:00:00 2001 From: Kroell Date: Thu, 2 Mar 2023 09:24:39 -0500 Subject: [PATCH 4/7] typo --- src/layouts/coverage-statement/coverage-statement.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index 3aaa0ebd..7778c6e6 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -61,7 +61,6 @@ import { import { settleAllPromises } from '@/helpers/layout-helper'; import { getDamageString } from '@/helpers/damage-helper.js'; import { useMainStore } from "@/store"; -import { throwStatement, tSMethodSignature } from '@babel/types'; export default { name: 'coverage-statement', From aa56529089af9c3ae34dd652482f777adc6f1432 Mon Sep 17 00:00:00 2001 From: Kroell Date: Thu, 2 Mar 2023 11:14:13 -0500 Subject: [PATCH 5/7] typo fix --- src/constants/dynamic-strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constants/dynamic-strings.js b/src/constants/dynamic-strings.js index 9943ba90..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:", - MODAL_LINK: "modalLink:" + MODAL_LINK: "modalLink" }; export { dynamicStrings }; \ No newline at end of file From a14908206618b7528a84e4d0810ac6d113773534 Mon Sep 17 00:00:00 2001 From: Kroell Date: Thu, 2 Mar 2023 11:14:27 -0500 Subject: [PATCH 6/7] set default for carrier name in store --- src/store/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index 19aff5c1..42bc530d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -98,7 +98,7 @@ const getDefaultState = () => { triggeredSiteEntry: false, }, issConfig: { - clientName: "", + clientName: "Carrier", // this is the default and will be overriden by the client's name styleSheet: "", accountNumber: 0, } From fb3dd18a33f2549e30fb7351b0c8f9631f665719 Mon Sep 17 00:00:00 2001 From: Kroell Date: Fri, 3 Mar 2023 08:19:43 -0500 Subject: [PATCH 7/7] renamed default value in store --- src/store/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index 42bc530d..a0483873 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -98,7 +98,7 @@ const getDefaultState = () => { triggeredSiteEntry: false, }, issConfig: { - clientName: "Carrier", // this is the default and will be overriden by the client's name + clientName: "Generic Insurance", // this is the default and will be overriden by the client's name styleSheet: "", accountNumber: 0, }