jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updating string file name

Browse source
This commit is contained in:
Max 2022-04-19 14:41:56 -04:00
parent 44e0539068
commit 70775140e6
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/constants/magic-strings.js → src/constants/dynamic-strings.js
View file

@ -1,7 +1,7 @@
const magicStrings = { const dynamicStrings = {
GLOBAL_STATE: "globalState", GLOBAL_STATE: "globalState",
CUSTOM: "custom", CUSTOM: "custom",
ROUTER_LINK: "routerLink" ROUTER_LINK: "routerLink"
}; };
export { magicStrings }; export { dynamicStrings };

8
src/helpers/cms-content-helper.js
View file

@ -1,6 +1,6 @@
import { storeActions } from "@/constants/store-actions.js"; import { storeActions } from "@/constants/store-actions.js";
import store from "@/store"; import store from "@/store";
import { magicStrings } from "../constants/magic-strings"; import { dynamicStrings } from "../constants/dynamic-strings";
export function fetchCmsContentForPage(fmgPage) { export function fetchCmsContentForPage(fmgPage) {
return store return store
@ -43,7 +43,7 @@ function mapStringToState(str) {
const regexExp = new RegExp("{(.*?):(.*?)}", "g"); const regexExp = new RegExp("{(.*?):(.*?)}", "g");
const regexMatches = [...str.matchAll(regexExp)]; const regexMatches = [...str.matchAll(regexExp)];
const globalStateMatches = regexMatches.filter(match => { const globalStateMatches = regexMatches.filter(match => {
return match[1] === magicStrings.GLOBAL_STATE; return match[1] === dynamicStrings.GLOBAL_STATE;
}) })
// Our final string value that will be built from the matches. // Our final string value that will be built from the matches.
@ -64,7 +64,7 @@ function mapStringToState(str) {
const stringWithReplacement = str.replace(match[0], storeState); const stringWithReplacement = str.replace(match[0], storeState);
// If we still have values we need to substitute, call this function again. // If we still have values we need to substitute, call this function again.
if (stringWithReplacement.includes(magicStrings.GLOBAL_STATE)) { if (stringWithReplacement.includes(dynamicStrings.GLOBAL_STATE)) {
return mapStringToState(stringWithReplacement); return mapStringToState(stringWithReplacement);
} }
@ -100,7 +100,7 @@ function findAndReplaceGlobalStateValues(widgetModel, widgetName) {
function processWidgetItemForReplacement(widgetModel, key) { function processWidgetItemForReplacement(widgetModel, key) {
// If we have a string, and it needs to be replaced. // If we have a string, and it needs to be replaced.
if (typeof widgetModel[key] === "string") { if (typeof widgetModel[key] === "string") {
if (widgetModel[key].includes(magicStrings.GLOBAL_STATE)) { if (widgetModel[key].includes(dynamicStrings.GLOBAL_STATE)) {
widgetModel[key] = mapStringToState(widgetModel[key]); widgetModel[key] = mapStringToState(widgetModel[key]);
} }
return widgetModel[key]; return widgetModel[key];

15
src/layouts/license-plate-lookup/license-plate-lookup.vue
View file

@ -186,21 +186,24 @@ export default {
this.$refs.funnelFooter.updateButtonText(`Continue with ${vinLookup.data.vin} ${vinLookup.data.vehicle.year} ${vinLookup.data.vehicle.make} ${vinLookup.data.vehicle.model}`); this.$refs.funnelFooter.updateButtonText(`Continue with ${vinLookup.data.vin} ${vinLookup.data.vehicle.year} ${vinLookup.data.vehicle.make} ${vinLookup.data.vehicle.model}`);
this.$refs.funnelFooter.removeLoader(); this.$refs.funnelFooter.removeLoader();
this.vinDoesNotMatchCarId = true; this.vinDoesNotMatchCarId = true;
return; //return;
} }
let vin; let vin;
let vehicleInfo; let vehicleInfo;
let glassOptions;
if(this.vinDoesNotMatchCarId) { if(this.vinDoesNotMatchCarId) {
vin = vinLookup.data.vin; vin = vinLookup.data.vin;
vehicleInfo = vinLookup.data.vehicle; vehicleInfo = vinLookup.data.vehicle;
glassOptions = store.dispatch(storeActions.GET_DAMAGE_OPTIONS, { carId: vinLookup.data.vehicle.carId }).data;
} else { } else {
vin = store.getters.vehicle.vin; vin = store.getters.vehicle.vin;
vehicleInfo = store.getters.vehicle; vehicleInfo = store.getters.vehicle;
glassOptions = store.getters.damage.glassToReplace;
} }
this.updateCustomerInfo(vin, vehicleInfo, zipValidation.data.state); //this.updateCustomerInfo(vin, vehicleInfo, zipValidation.data.state);
const partsData = await baseMixin.methods.dispatchNonBlockingStoreAction( const partsData = await baseMixin.methods.dispatchNonBlockingStoreAction(
this.storeActions.GET_PARTS_OR_QUESTIONS, this.storeActions.GET_PARTS_OR_QUESTIONS,
@ -212,15 +215,13 @@ export default {
}, },
false false
); );
this.navigateForward(partsData); console.log(partsData)
//this.navigateForward(partsData);
}, },
navigateForward(partsData){ navigateForward(partsData){
if(partsData.data.partsOrQuestions[0].partQuestions && partsData.data.partsOrQuestions[0].partQuestions.length > 0){ if(partsData.data){
this.$router.navigateAfterSave(this.navigationScenarios.CONTINUING_WITH_PARTS_QUESTION, this.$route, {}, {}, partsData.data); this.$router.navigateAfterSave(this.navigationScenarios.CONTINUING_WITH_PARTS_QUESTION, this.$route, {}, {}, partsData.data);
return; return;
} else if((!partsData.data.partsOrQuestions[0].partQuestions || partsData.data.partsOrQuestions[0].partQuestions.length < 1) && partsData.data.partsOrQuestions[0].parts.length > 1) {
this.$router.navigateAfterSave(this.navigationScenarios.CONTINUING_WITH_MULTIPLE_PARTS, this.$route, {}, {}, partsData.data);
return;
} else { } else {
navigateToHeritageFunnel(); navigateToHeritageFunnel();
return; return;