Migrate Parameters component to React #4006
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
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
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
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,203 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { size, filter, forEach, extend } from 'lodash'; | ||
| import { react2angular } from 'react2angular'; | ||
| import { sortableContainer, sortableElement, sortableHandle } from 'react-sortable-hoc'; | ||
| import { $location } from '@/services/ng'; | ||
| import { Parameter } from '@/services/query'; | ||
| import ParameterApplyButton from '@/components/ParameterApplyButton'; | ||
| import ParameterValueInput from '@/components/ParameterValueInput'; | ||
| import EditParameterSettingsDialog from './EditParameterSettingsDialog'; | ||
| import { toHuman } from '@/filters'; | ||
|
|
||
| import './Parameters.less'; | ||
|
|
||
| const DragHandle = sortableHandle(({ parameterName }) => ( | ||
| <div className="drag-handle" data-test={`DragHandle-${parameterName}`} /> | ||
| )); | ||
|
|
||
| const SortableItem = sortableElement(({ className, parameterName, disabled, children }) => ( | ||
| <div className={className} data-editable={!disabled || null}> | ||
| {!disabled && <DragHandle parameterName={parameterName} />} | ||
| {children} | ||
| </div> | ||
| )); | ||
| const SortableContainer = sortableContainer(({ children }) => children); | ||
|
|
||
| function updateUrl(parameters) { | ||
| const params = extend({}, $location.search()); | ||
| parameters.forEach((param) => { | ||
| extend(params, param.toUrlParams()); | ||
| }); | ||
| Object.keys(params).forEach(key => params[key] == null && delete params[key]); | ||
| $location.search(params); | ||
| } | ||
|
|
||
| export class Parameters extends React.Component { | ||
| static propTypes = { | ||
| parameters: PropTypes.arrayOf(PropTypes.instanceOf(Parameter)), | ||
| editable: PropTypes.bool, | ||
| disableUrlUpdate: PropTypes.bool, | ||
| onValuesChange: PropTypes.func, | ||
| onParametersEdit: PropTypes.func, | ||
| }; | ||
|
|
||
| static defaultProps = { | ||
| parameters: [], | ||
| editable: false, | ||
| disableUrlUpdate: false, | ||
| onValuesChange: () => {}, | ||
| onParametersEdit: () => {}, | ||
| } | ||
|
|
||
| constructor(props) { | ||
| super(props); | ||
| const { parameters } = props; | ||
| this.state = { parameters, dragging: false }; | ||
| if (!props.disableUrlUpdate) { | ||
| updateUrl(parameters); | ||
| } | ||
| } | ||
|
|
||
| componentDidUpdate = (prevProps) => { | ||
| const { parameters, disableUrlUpdate } = this.props; | ||
| if (prevProps.parameters !== parameters) { | ||
| this.setState({ parameters }); | ||
| if (!disableUrlUpdate) { | ||
| updateUrl(parameters); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| handleKeyDown = (e) => { | ||
| // Cmd/Ctrl/Alt + Enter | ||
| if (e.keyCode === 13 && (e.ctrlKey || e.metaKey || e.altKey)) { | ||
| e.stopPropagation(); | ||
gabrieldutra marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| this.applyChanges(); | ||
| } | ||
| }; | ||
|
|
||
| setPendingValue = (param, value, isDirty) => { | ||
| this.setState(({ parameters }) => { | ||
| if (isDirty) { | ||
| param.setPendingValue(value); | ||
| } else { | ||
| param.clearPendingValue(); | ||
| } | ||
| return { parameters }; | ||
| }); | ||
| }; | ||
|
|
||
| moveParameter = ({ oldIndex, newIndex }) => { | ||
| const { onParametersEdit } = this.props; | ||
| if (oldIndex !== newIndex) { | ||
| this.setState(({ parameters }) => { | ||
| parameters.splice(newIndex, 0, parameters.splice(oldIndex, 1)[0]); | ||
| onParametersEdit(); | ||
| return { parameters }; | ||
| }); | ||
| } | ||
| this.setState({ dragging: false }); | ||
| }; | ||
|
|
||
| onBeforeSortStart = () => { | ||
| this.setState({ dragging: true }); | ||
| }; | ||
|
|
||
| applyChanges = () => { | ||
| const { onValuesChange, disableUrlUpdate } = this.props; | ||
| this.setState(({ parameters }) => { | ||
| forEach(parameters, p => p.applyPendingValue()); | ||
| onValuesChange(); | ||
| if (!disableUrlUpdate) { | ||
| updateUrl(parameters); | ||
| } | ||
| return { parameters }; | ||
| }); | ||
| }; | ||
|
|
||
| showParameterSettings = (parameter, index) => { | ||
| const { onParametersEdit } = this.props; | ||
| EditParameterSettingsDialog | ||
| .showModal({ parameter }) | ||
| .result.then((updated) => { | ||
| this.setState(({ parameters }) => { | ||
| const updatedParameter = extend(parameter, updated); | ||
| parameters[index] = new Parameter(updatedParameter, updatedParameter.parentQueryId); | ||
|
There was a problem hiding this comment. Same idea here, but reconstructing the Parameter instead. |
||
| onParametersEdit(); | ||
| return { parameters }; | ||
| }); | ||
| }); | ||
| }; | ||
|
|
||
| renderParameter(param, index) { | ||
| const { editable } = this.props; | ||
| return ( | ||
| <div | ||
| key={param.name} | ||
| className="di-block" | ||
| data-test={`ParameterName-${param.name}`} | ||
| > | ||
| <div className="parameter-heading"> | ||
| <label>{param.title || toHuman(param.name)}</label> | ||
|
|
||
| {editable && ( | ||
| <button | ||
| className="btn btn-default btn-xs m-l-5" | ||
| onClick={() => this.showParameterSettings(param, index)} | ||
| data-test={`ParameterSettings-${param.name}`} | ||
| type="button" | ||
| > | ||
| <i className="fa fa-cog" /> | ||
| </button> | ||
| )} | ||
| </div> | ||
| <ParameterValueInput | ||
| type={param.type} | ||
| value={param.normalizedValue} | ||
| parameter={param} | ||
| enumOptions={param.enumOptions} | ||
| queryId={param.queryId} | ||
| allowMultipleValues={!!param.multiValuesOptions} | ||
| onSelect={(value, isDirty) => this.setPendingValue(param, value, isDirty)} | ||
| /> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| render() { | ||
| const { parameters, dragging } = this.state; | ||
| const { editable } = this.props; | ||
| const dirtyParamCount = size(filter(parameters, 'hasPendingValue')); | ||
| return ( | ||
| <SortableContainer | ||
| axis="xy" | ||
| useDragHandle | ||
| lockToContainerEdges | ||
| helperClass="parameter-dragged" | ||
| updateBeforeSortStart={this.onBeforeSortStart} | ||
| onSortEnd={this.moveParameter} | ||
| > | ||
| <div | ||
| className="parameter-container" | ||
| onKeyDown={dirtyParamCount ? this.handleKeyDown : null} | ||
| data-draggable={editable || null} | ||
| data-dragging={dragging || null} | ||
| > | ||
| {parameters.map((param, index) => ( | ||
| <SortableItem className="parameter-block" key={param.name} index={index} parameterName={param.name} disabled={!editable}> | ||
| {this.renderParameter(param, index)} | ||
| </SortableItem> | ||
| ))} | ||
|
|
||
| <ParameterApplyButton onClick={this.applyChanges} paramCount={dirtyParamCount} /> | ||
| </div> | ||
| </SortableContainer> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default function init(ngModule) { | ||
| ngModule.component('parameters', react2angular(Parameters)); | ||
| } | ||
|
|
||
| init.init = true; | ||
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.
Removed
isApplyingas it was not affecting anything.