Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix UI crash when using time popup #2166

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions client/components/UI/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ interface IButtonProps {
children?: React.ReactNode;
pullRight?: boolean;
empty?: boolean;
testId?: string;
}

const Button = ({
Expand All @@ -53,6 +54,7 @@ const Button = ({
refNode,
onKeyDown,
children,
testId,
...props
}: IButtonProps) => {
const handeKeyDown = (event) => {
Expand Down Expand Up @@ -92,6 +94,7 @@ const Button = ({
onKeyDown={enterKeyIsClick ? handeKeyDown : onKeyDown}
autoFocus={autoFocus}
ref={refNode}
data-test-id={testId}
{...props}
>
{icon && <i className={icon} />}
Expand Down
3 changes: 3 additions & 0 deletions client/components/UI/Form/TimeInput/TimeInputPopup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,19 +180,22 @@ export class TimeInputPopup extends React.Component<IProps, IState> {
size="small"
pullRight
onClick={() => this.handleClear()}
testId="time-popup-clear"
/>
<Button
text={gettext('Confirm')}
color="primary"
size="small"
pullRight={true}
onClick={() => this.handleConfirm(0)}
testId="time-popup-confirm"
/>
<Button
text={gettext('Cancel')}
size="small"
pullRight={true}
onClick={this.props.close}
testId="time-popup-cancel"
/>

</Footer>
Expand Down
1 change: 1 addition & 0 deletions client/components/UI/Form/TimeInput/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ export class TimeInput extends React.Component {
onFocus={onFocus}
onClick={!readOnly ? this.toggleOpenTimePicker : null}
aria-label={gettext('Time picker')}
testId="time-popup-toggle"
/>
<Input
field={field}
Expand Down
3 changes: 3 additions & 0 deletions client/components/UI/IconButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const IconButton = ({
label,
tooltip,
tooltipDirection,
testId,
...props
}) => {
const handleKeyDown = (event) => {
Expand All @@ -50,6 +51,7 @@ const IconButton = ({
onKeyDown={enterKeyIsClick ? handleKeyDown : onKeyDown}
data-sd-tooltip={tooltip}
data-flow={tooltipDirection}
data-test-id={testId}
{...props}
>
<Icon icon={icon} />
Expand All @@ -70,6 +72,7 @@ IconButton.propTypes = {
label: PropTypes.string,
tooltip: PropTypes.string,
tooltipDirection: PropTypes.string,
testId: PropTypes.string,
};

IconButton.defaultProps = {
Expand Down
4 changes: 2 additions & 2 deletions client/validators/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ const validateDateInPast = ({getState, value, errors, messages}) => {
const canCreateInPast = !!privileges[PRIVILEGES.CREATE_IN_PAST];
const today = moment();

const startDate = value.all_day ? getDateOnly(value.start) : value.start;
const endDate = value.all_day || value.no_end_time ? getDateOnly(value.end) : value.end;
const startDate = value.start && value.all_day ? getDateOnly(value.start) : value.start;
const endDate = value.end && (value.all_day || value.no_end_time) ? getDateOnly(value.end) : value.end;

if (moment.isMoment(startDate) && startDate.isBefore(today, 'day')) {
set(errors, 'start.date', gettext('Start date is in the past'));
Expand Down
28 changes: 25 additions & 3 deletions e2e/cypress/e2e/events/event_all_day.cy.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import moment from 'moment';
import {setup, login, waitForPageLoad, SubNavBar, Workqueue, CLIENT_FORMAT} from '../../support/common';
import {setup, login, waitForPageLoad, SubNavBar, CLIENT_FORMAT} from '../../support/common';
import {PlanningList, EventEditor} from '../../support/planning';
import {getDateStringFor} from '../../support/utils/time';
import {create} from 'lodash';

describe('Planning.Events: all day', () => {
describe('Planning.Events: all day events and events without end time', () => {
const editor = new EventEditor();
const subnav = new SubNavBar();
const list = new PlanningList();
Expand Down Expand Up @@ -108,4 +107,27 @@ describe('Planning.Events: all day', () => {
list.item(0).find('[data-test-id="event-end-date"]').should('contain.text', event['dates.end.date']);
});

it('can clear time via popup', () => {
const event = {
...baseEvent,
'dates.start.date': moment().format(CLIENT_FORMAT),
'dates.start.time': '12:00',
'dates.end.time': '13:00',
};

editor.openAllToggleBoxes();
editor.type(event);

cy.get('[data-test-id="field-dates_end"]').find('[data-test-id="time-popup-toggle"]').click();
cy.get('[data-test-id="time-popup-clear"]').click();

cy.get('[data-test-id="field-dates_start"]').find('[data-test-id="time-popup-toggle"]').click();
cy.get('[data-test-id="time-popup-clear"]').click();

editor.createButton
.should('exist')
.click();

list.item(0).find('[data-test-id="event-start-date"]').should('contain.text', event['dates.start.date']);
});
});
6 changes: 4 additions & 2 deletions e2e/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.8"

name: superdesk-planning-e2e

services:
Expand All @@ -11,6 +9,10 @@ services:
- e2e
tmpfs:
- /usr/share/elasticsearch/data
deploy:
resources:
limits:
memory: 2g

redis:
image: redis:alpine
Expand Down
Loading