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.

Sign up for GitHub

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

Jump to bottom

Feature: Refresh schedule - styling #3247

Merged
merged 2 commits into from
Jan 6, 2019
Merged

Feature: Refresh schedule - styling #3247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2aa220
Feature: Refresh schedule - styling
ranbena Jan 3, 2019
18b3ceb
Feature: Refresh Schedule - Ant TimePicker
ranbena Jan 6, 2019
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
2 changes: 2 additions & 0 deletions client/app/assets/less/redash/ant.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
@import '~antd/lib/tooltip/style/index.less';
@import '~antd/lib/select/style/index.less';
@import '~antd/lib/button/style/index.less';
@import '~antd/lib/radio/style/index.less';
@import '~antd/lib/time-picker/style/index.less';

// Overwritting Ant Design defaults to fit into Redash current style
@font-family-no-number : @redash-font;
Expand Down
23 changes: 18 additions & 5 deletions client/app/components/queries/ScheduleDialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
.schedule {
width: 300px !important;
width: 449px !important;
margin: 0 auto;
}

.schedule-component {
padding: 5px 0px;
}

.schedule-component > div {
padding-right: 5px;
float: left;
}
.schedule-component > * {
display: inline-block;
}

.schedule-component h5 {
margin-right: 10px;
width: 87px;
text-align: right;
}

.schedule-component > div > *:not(:last-child) {
margin-right: 3px;
}

.schedule-component datepicker {
display: block;
}
147 changes: 82 additions & 65 deletions client/app/components/queries/ScheduleDialog.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import React from 'react';
import PropTypes from 'prop-types';
import Modal from 'antd/lib/modal';
import DatePicker from 'antd/lib/date-picker';
import { range, padStart, clone, isEqual } from 'lodash';
import TimePicker from 'antd/lib/time-picker';
import Select from 'antd/lib/select';
import Radio from 'antd/lib/radio';
import { range, clone, isEqual } from 'lodash';
import moment from 'moment';
import { secondsToInterval, intervalToSeconds, IntervalEnum } from '@/filters';

Expand All @@ -19,10 +22,9 @@ const INTERVAL_OPTIONS_MAP = {
[IntervalEnum.WEEKS]: 5,
};

const HOUR_OPTIONS = range(0, 24).map(x => padStart(x, 2, '0')); // [00, 01, 02, ..]
const MINUTE_OPTIONS = range(0, 60, 5).map(x => padStart(x, 2, '0')); // [00, 05, 10, ..]
const DATE_FORMAT = 'YYYY-MM-DD';
const HOUR_FORMAT = 'HH:mm';
const Option = Select.Option;

function localizeTime(time) {
const [hrs, mins] = time.split(':');
Expand All @@ -47,6 +49,7 @@ class ScheduleDialog extends React.Component {
constructor(props) {
super(props);
this.state = this.initState;
this.modalRef = React.createRef(); // used by <Select>
}

get initState() {
Expand Down Expand Up @@ -92,26 +95,13 @@ class ScheduleDialog extends React.Component {
});
}

setTime = (h, m) => {
setTime = (time) => {
this.newSchedule = {
time:
h && m
? moment()
.hour(h)
.minute(m)
.utc()
.format(HOUR_FORMAT)
: null,
time: moment(time).utc().format(HOUR_FORMAT),
};

this.setState({
hour: h,
minute: m,
});
};

setInterval = (e) => {
const newInterval = e.target.value;
setInterval = (newInterval) => {
const { newSchedule } = this.state;

// resets to defaults
Expand Down Expand Up @@ -159,14 +149,13 @@ class ScheduleDialog extends React.Component {
this.newSchedule = newSchedule;
};

setCount = (e) => {
const newCount = e.target.value;
setCount = (newCount) => {
const totalSeconds = intervalToSeconds(parseInt(newCount, 10), this.state.interval);
this.setState({ count: newCount });
this.newSchedule = { interval: totalSeconds };
};

setScheduleUntil = (momentDate, date) => {
setScheduleUntil = (_, date) => {
this.newSchedule = { until: date };
};

Expand All @@ -178,6 +167,11 @@ class ScheduleDialog extends React.Component {
};
};

setUntilToggle = (e) => {
const date = e.target.value ? moment().format(DATE_FORMAT) : null;
this.setScheduleUntil(null, date);
}

save() {
// save if changed
if (!isEqual(this.state.newSchedule, this.props.query.schedule)) {
Expand All @@ -194,8 +188,14 @@ class ScheduleDialog extends React.Component {

render() {
const {
interval, minute, hour, until, count,
interval, minute, hour, count, newSchedule: { until },
} = this.state;
const fixZIndex = { getPopupContainer: () => this.modalRef.current };
const selectProps = {
...fixZIndex,
className: 'input',
dropdownMatchSelectWidth: false,
};

return (
<Modal
Expand All @@ -205,60 +205,77 @@ class ScheduleDialog extends React.Component {
onCancel={() => this.cancel()}
onOk={() => this.save()}
>
<div className="schedule-component">
<div>Refresh every</div>
{interval !== IntervalEnum.NEVER ? (
<select value={count} onChange={this.setCount}>
{this.counts.map(cnt => (
<option value={String(cnt)} key={cnt}>{cnt}</option>
<div className="schedule-component" ref={this.modalRef}>
<h5>Refresh every</h5>
<div>
{interval !== IntervalEnum.NEVER ? (
<Select value={count} onChange={this.setCount} {...selectProps}>
{this.counts.map(cnt => (
<Option value={String(cnt)} key={cnt}>{cnt}</Option>
))}
</Select>
) : null}
<Select value={interval} onChange={this.setInterval} {...selectProps}>
{this.intervals.map(iv => (
<Option value={iv.name} key={iv.name}>{iv.name}</Option>
))}
</select>
) : null}
<select value={interval} onChange={this.setInterval}>
{this.intervals.map(iv => (
<option value={iv.name} key={iv.name}>{iv.name}</option>
))}
</select>
</Select>
</div>
</div>
{[IntervalEnum.DAYS, IntervalEnum.WEEKS].indexOf(interval) !== -1 ? (
<div className="schedule-component">
<div>At the following time</div>
<select value={hour} onChange={e => this.setTime(e.target.value, minute)}>
{HOUR_OPTIONS.map(h => (
<option key={h} value={h}>{h}</option>
))}
</select>
<select value={minute} onChange={e => this.setTime(hour, e.target.value)}>
{MINUTE_OPTIONS.map(m => (
<option key={m} value={m}>{m}</option>
))}
</select>
<h5>On time</h5>
<div>
<TimePicker
allowEmpty={false}
defaultValue={moment().hour(hour).minute(minute)}
format={HOUR_FORMAT}
minuteStep={5}
onChange={this.setTime}
{...fixZIndex}
/>
</div>
</div>
) : null}
{IntervalEnum.WEEKS === interval ? (
<div className="btn-toolbar schedule-component">
<div className="btn-group" data-toggle="buttons">
<div className="schedule-component">
<h5>On day</h5>
<Radio.Group
size="medium"
defaultValue={this.state.dayOfWeek}
onChange={this.setWeekday}
>
{WEEKDAYS_SHORT.map(day => (
<button
className={`btn btn-xs btn-default${this.state.dayOfWeek === day ? ' active' : ''}`}
onClick={this.setWeekday}
key={day}
value={day}
>
{day}
</button>
<Radio.Button value={day} key={day} className="input">
{day[0]}
</Radio.Button>
))}
</div>
</Radio.Group>
</div>
) : null}
{interval ? (
{interval !== IntervalEnum.NEVER ? (
<div className="schedule-component">
<div>Stop refresh on:</div>
<DatePicker
format={DATE_FORMAT}
placeholder={until || 'Select Date'}
onChange={this.setScheduleUntil}
/>
<h5>Ends</h5>
<div className="ends">
<Radio.Group
size="medium"
value={!!until}
onChange={this.setUntilToggle}
>
<Radio value={false}>Never</Radio>
<Radio value>On</Radio>
</Radio.Group>
{until ? (
<DatePicker
size="small"
className="datepicker"
value={moment(until)}
allowClear={false}
format={DATE_FORMAT}
onChange={this.setScheduleUntil}
/>
) : null}
</div>
</div>
) : null}
</Modal>
Expand Down