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

Merge pull request #523 from Safelite/feature/richardson/SSR-1052

Browse source 
fix for modal button being actually disabled  and keep styling
This commit is contained in:
brich1212safe 2023-12-13 21:32:09 -05:00 committed by GitHub
commit 3205612629
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/digital-components/modal/modal.vue
View file

@ -34,7 +34,6 @@
loaderColor="white"
:buttonText="footerButtonText"
:class="(isButtonDisabled || isFooterButtonDisabled) && 'form-test-invalid'"
:isDisabled="(isButtonDisabled || isFooterButtonDisabled)"
@clickEvent="validateAndEmit" />
</div>
</div>

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

@ -199,7 +199,7 @@ function getCmsSiteHeader(cmsResponse) {
const { parentAccountNumber } = useMainStore().issConfig;
let headerAnswersToUse = siteHeader.Answers
.find((answer) => answer.AccountNumber === parentAccountNumber.toString());
if (headerAnswersToUse === null) {
if (headerAnswersToUse == null) {
headerAnswersToUse = siteHeader.Answers
.find((answer) => answer.AccountNumber === '0');
}

22
src/iss-components/site-header/site-header.vue
View file

@ -86,6 +86,28 @@ export default ({
},
methods: {
setupHeader() {
const overrideCmsHeaderAnswers = this.getCmsContent(this.cmsWidgetName, 'Answers');
if (overrideCmsHeaderAnswers && Array.isArray(overrideCmsHeaderAnswers)) {
const { parentAccountNumber } = useMainStore().issConfig;
let headerOverrideToUse = overrideCmsHeaderAnswers
.find((answer) => answer.AccountNumber === parentAccountNumber.toString());
if (headerOverrideToUse == null) {
headerOverrideToUse = overrideCmsHeaderAnswers
.find((answer) => answer.AccountNumber === '0');
}
if (headerOverrideToUse) {
this.cmsClientHeader = {
altText: headerOverrideToUse.AltText,
clientName: headerOverrideToUse.ClientName,
hexCode: headerOverrideToUse.HexCode,
imageId: headerOverrideToUse.ImageId,
imageUrl: headerOverrideToUse.AnswerImageUrl
};
return;
}
}
const { clientHeader } = useMainStore().issConfig;
if (clientHeader) {
this.cmsClientHeader = clientHeader;

5
src/styles/client-customizations.scss
View file

@ -27,17 +27,18 @@ $limu-button-color: #A9E3E9;
}
.btn {
&.btn-override[aria-disabled="false"]{
&.btn-override[aria-disabled="false"]:not(.form-test-invalid) {
&.btn-primary {
background: $limu-button-color !important;
color: $limu-button-text-color !important;
}
&:focus-visible {
background: $limu-button-color !important;
color: $limu-button-text-color !important;
box-shadow: 0 0 0 3px $white, 0 0 0 5.5px $limu-button-color !important;
}
}
}