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

Merge pull request #478 from Safelite/bugfix/CSR-584

Browse source 
CSR-584: fix missing zip-format validation rule, reformatting
This commit is contained in:
AdamCaouetteSafelite 2022-05-19 13:29:13 -04:00 committed by GitHub
commit 4da61654b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@
v-model="registrationZip" v-model="registrationZip"
inputId="zip" inputId="zip"
mask="#####" mask="#####"
validationRules="zip-required" validationRules="zip-required|zip-format"
/> />
</div> </div>
</div> </div>
@ -54,6 +54,7 @@
v-model="serviceZip" v-model="serviceZip"
inputId="serviceZip" inputId="serviceZip"
validationRules="zip-required|zip-format" validationRules="zip-required|zip-format"
semiAggressiveValidation
/> />
</div> </div>
</div> </div>
@ -87,56 +88,25 @@ import alert from "@/ux-components/alert/alert";
import textboxQuestion from "@/common-components/textbox-question/textbox-question"; import textboxQuestion from "@/common-components/textbox-question/textbox-question";
import loadingModal from '@/common-components/loading-modal/loading-modal.vue'; import loadingModal from '@/common-components/loading-modal/loading-modal.vue';
// Supporting files // Supporting files
import { import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
fetchCmsContentForPage import { settleAllPromises } from "@/helpers/layout-helper";
} from "@/helpers/cms-content-helper";
import {
settleAllPromises
} from "@/helpers/layout-helper";
import store from "@/store"; import store from "@/store";
import baseMixin from "@/mixins/base-mixin.js"; import baseMixin from "@/mixins/base-mixin.js";
import { import { storeActions } from "@/constants/store-actions";
storeActions import { storeMutations } from "@/constants/store-mutations";
} from "@/constants/store-actions"; import { errorMessages } from "@/constants/error-messages";
import { import { navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
storeMutations import { getDamageString, isGlassAvailableForCarId, } from "@/helpers/damage-helper";
} from "@/constants/store-mutations"; import { required, regex, } from "@/helpers/validation-rules";
import { import { Form, defineRule, } from "vee-validate";
errorMessages
} from "@/constants/error-messages";
import {
navigateAfterSaveToHeritageFunnel
} from "@/helpers/heritage-integration/navigation-helper";
import {
getDamageString,
isGlassAvailableForCarId,
} from "@/helpers/damage-helper";
import {
required,
regex,
} from "@/helpers/validation-rules";
import {
Form,
defineRule,
} from "vee-validate";
// DEFINE VALIDATION RULES // DEFINE VALIDATION RULES
defineRule( defineRule("license-plate-required", required(errorMessages.LICENSE_PLATE_REQUIRED));
"license-plate-required",
required(errorMessages.LICENSE_PLATE_REQUIRED)
);
defineRule("zip-required", required(errorMessages.REGISTRATION_ZIP_REQUIRED)); defineRule("zip-required", required(errorMessages.REGISTRATION_ZIP_REQUIRED));
defineRule( defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
"email-address-required", defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED));
required(errorMessages.EMAIL_ADDRESS_REQUIRED) defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT));
);
defineRule(
"email-address-format",
regex(
/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/,
errorMessages.EMAIL_ADDRESS_FORMAT
)
);
export default { export default {
name: "license-plate-lookup", name: "license-plate-lookup",
async beforeRouteEnter(to, from, next) { async beforeRouteEnter(to, from, next) {

31
src/layouts/vin-lookup/vin-lookup.vue
View file

@ -41,7 +41,7 @@
mask="#####" mask="#####"
isRequired isRequired
disableAutoFill disableAutoFill
validationRules="zip-required" validationRules="zip-required|zip-format"
/> />
</div> </div>
</div> </div>
@ -141,29 +141,12 @@ import { Form, defineRule } from "vee-validate";
import { navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper"; import { navigateAfterSaveToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
// DEFINE VALIDATION RULES // DEFINE VALIDATION RULES
defineRule( defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
"zip-required", defineRule("zip-format", regex(/(^\d{5}$)|(^\d{5}-\d{4}$)/, errorMessages.SERVICE_ZIP_FORMAT));
required(errorMessages.SERVICE_ZIP_REQUIRED) defineRule("email-address-required", required(errorMessages.EMAIL_ADDRESS_REQUIRED));
); defineRule("email-address-format", regex(/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/, errorMessages.EMAIL_ADDRESS_FORMAT));
defineRule( defineRule("vin-required", required(errorMessages.VIN_REQUIRED));
"email-address-required", defineRule("vin-format", regex(/^[A-HJ-NPR-Z0-9]{17}$/, errorMessages.VIN_FORMAT));
required(errorMessages.EMAIL_ADDRESS_REQUIRED)
);
defineRule(
"email-address-format",
regex(
/^([a-zA-Z0-9_\-.+]+)@([a-zA-Z0-9_\-.]+)\.([a-zA-Z]{2,})$/,
errorMessages.EMAIL_ADDRESS_FORMAT
)
);
defineRule(
"vin-required",
required(errorMessages.VIN_REQUIRED)
);
defineRule(
"vin-format",
regex(/^[a-hA-Hj-nJ-NpPr-zR-Z0-9]{17}$/, errorMessages.VIN_FORMAT)
);
export default { export default {
name: "vin-lookup", name: "vin-lookup",