Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-18 02:21:47 -05:00
Code Issues Activity

Fixed error message of the date-time-picker not breaking onto next line (#20221)

Browse source 
REF DES-261

- Also updated error message copy of both the date-time-picker and the
date-picker to be friendlier.
This commit is contained in:
Sanne de Vries 2024-05-16 16:59:07 +02:00 • committed by GitHub
parent 239b5b6369
commit c157619e3e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ghost/admin/app/components/gh-date-time-picker.hbs
View file

@ -37,7 +37,7 @@
>
<small class="gh-date-time-picker-timezone" data-test-date-time-picker-timezone>{{this.timezone}}</small>
</div>
{{#if this.hasError}}
<div class="gh-date-time-picker-error" data-test-date-time-picker-error>{{this.dateError}}{{this.timeError}}</div>
{{/if}}
</div>
{{#if this.hasError}}
<div class="gh-date-time-picker-error" data-test-date-time-picker-error>{{this.dateError}}{{this.timeError}}</div>
{{/if}}

2
ghost/admin/app/components/members/filter-value.hbs
View file

@ -118,7 +118,7 @@
<GhDatePicker
@value={{@filter.value}}
@maxDate={{now}}
@maxDateError="Must be in the past"
@maxDateError="Please choose a past date."
@onChange={{fn @setFilterValue @filter}}
data-test-input="members-filter-value"
/>

7
ghost/admin/app/styles/components/publishmenu.css
View file

@ -99,17 +99,16 @@
.gh-date-time-picker-timezone {
font-size: 1.1rem;
font-weight: 300;
color: color-mod(var(--midgrey) l(+17%));
color: var(--midgrey);
margin-left: -30px;
}
.gh-date-time-picker-error {
display: block;
padding-top: 4px;
font-size: 1.3rem;
line-height: 1.4em;
font-weight: 300;
color: var(--red);
color: var(--red-d1);
}
.gh-publish-send-to {

4
ghost/admin/app/validators/post.js
View file

@ -190,12 +190,12 @@ export default BaseValidator.create({
// draft/published must be in past
if ((status === 'draft' || status === 'published') && publishedAtBlogTZ.isSameOrAfter(now)) {
model.errors.add('publishedAtBlogDate', 'Must be in the past');
model.errors.add('publishedAtBlogDate', 'Please choose a past date and time.');
this.invalidate();
// scheduled must be in the future when first scheduling
} else if ((model.changedAttributes().status || model.changedAttributes().publishedAtUTC) && status === 'scheduled' && !isInFuture) {
model.errors.add('publishedAtBlogDate', 'Must be in the future');
model.errors.add('publishedAtBlogDate', 'Please choose a future date and time.');
this.invalidate();
}
}

2
ghost/admin/tests/acceptance/editor-test.js
View file

@ -153,7 +153,7 @@ describe('Acceptance: Editor', function () {
await blur('[data-test-date-time-picker-time-input]');
expect(find('[data-test-date-time-picker-error]').textContent.trim(), 'inline error response for future time')
.to.equal('Must be in the past');
.to.equal('Please choose a past date and time.');
// closing the PSM will reset the invalid date/time
await click('[data-test-psm-trigger]');

4
ghost/admin/tests/integration/components/gh-date-picker-test.js
View file

@ -333,12 +333,12 @@ describe('Integration: Component: gh-date-picker', function () {
this.set('date', moment('2022-02-22 22:22:22.000')).toDate();
this.set('maxDate', moment('2022-02-25 12:00:00.000').toDate());
await render(hbs`<GhDatePicker @value={{this.date}} @maxDate={{this.maxDate}} @maxDateError="Must be in the past" @onChange={{this.onChange}} />`);
await render(hbs`<GhDatePicker @value={{this.date}} @maxDate={{this.maxDate}} @maxDateError="Please choose a past date." @onChange={{this.onChange}} />`);
await fillIn('[data-test-date-picker-input]', '2022-02-28');
await blur('[data-test-date-picker-input]');
expect(find('[data-test-date-picker-error]')).to.have.text('Must be in the past');
expect(find('[data-test-date-picker-error]')).to.have.text('Please choose a past date.');
});
});