-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
Improve Date/DateTime type parameters #2695
Merged
arikfr
merged 2 commits into
getredash:master
from
kravets-levko:feature/better-datetime-inputs
Jul 25, 2018
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
import moment from 'moment'; | ||
import React from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { react2angular } from 'react2angular'; | ||
import { DatePicker } from 'antd'; | ||
import 'antd/dist/antd.less'; | ||
|
||
function DateInput({ | ||
value, | ||
placeholder, | ||
onSelect, | ||
clientConfig, | ||
}) { | ||
const format = clientConfig.dateFormat || 'YYYY-MM-DD'; | ||
const defaultValue = moment(value, format); | ||
return ( | ||
<DatePicker | ||
{...(defaultValue.isValid() ? { defaultValue } : {})} | ||
format={format} | ||
placeholder={placeholder} | ||
onChange={onSelect} | ||
/> | ||
); | ||
} | ||
|
||
DateInput.propTypes = { | ||
value: PropTypes.instanceOf(Date), | ||
placeholder: PropTypes.string, | ||
onSelect: PropTypes.func, | ||
}; | ||
|
||
DateInput.defaultProps = { | ||
value: Date.now(), | ||
placeholder: 'Select date', | ||
onSelect: () => {}, | ||
}; | ||
|
||
export default function init(ngModule) { | ||
ngModule.component('dateInput', react2angular(DateInput, null, ['clientConfig'])); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
import moment from 'moment'; | ||
import React from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { react2angular } from 'react2angular'; | ||
import { DatePicker } from 'antd'; | ||
import 'antd/dist/antd.less'; | ||
|
||
function DateTimeInput({ | ||
value, | ||
withSeconds, | ||
placeholder, | ||
onSelect, | ||
clientConfig, | ||
}) { | ||
const format = (clientConfig.dateFormat || 'YYYY-MM-DD') + | ||
(withSeconds ? ' HH:mm:ss' : ' HH:mm'); | ||
const defaultValue = moment(value, format); | ||
return ( | ||
<DatePicker | ||
showTime | ||
{...(defaultValue.isValid() ? { defaultValue } : {})} | ||
format={format} | ||
placeholder={placeholder} | ||
onChange={onSelect} | ||
/> | ||
); | ||
} | ||
|
||
DateTimeInput.propTypes = { | ||
value: PropTypes.instanceOf(Date), | ||
withSeconds: PropTypes.bool, | ||
placeholder: PropTypes.string, | ||
onSelect: PropTypes.func, | ||
}; | ||
|
||
DateTimeInput.defaultProps = { | ||
value: Date.now(), | ||
withSeconds: false, | ||
placeholder: 'Select date and time', | ||
onSelect: () => {}, | ||
}; | ||
|
||
export default function init(ngModule) { | ||
ngModule.component('dateTimeInput', react2angular(DateTimeInput, null, ['clientConfig'])); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,6 +28,12 @@ class Parameter { | |
this.global = parameter.global; | ||
this.enumOptions = parameter.enumOptions; | ||
this.queryId = parameter.queryId; | ||
|
||
// method to update parameter value from date/time picker component | ||
// (react does not support two-way binding with `ngModel`) | ||
this.updateValue = (function updateValue(value) { | ||
this.ngModel = value; | ||
}).bind(this); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not use the following? this.updateValue = value => this.ngModel = value; ( There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. oh, missed it, you're right |
||
} | ||
|
||
get ngModel() { | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Select Date
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also seems that we don't really use it customer placeholders. Maybe just pass a static value?