Add StoredVars tab #220
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // Licensed to the Software Freedom Conservancy (SFC) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The SFC licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| import React from "react"; | ||
| import ActionButton from "../ActionButton"; | ||
| import classNames from "classnames"; | ||
|
|
||
| export default class DeleteButton extends React.Component { | ||
| render() { | ||
| return ( | ||
| <ActionButton data-tip="<p>Delete</p>" {...this.props} className={classNames("si-delete", this.props.className)} />// eslint-disable-line react/prop-types | ||
| ); | ||
| } | ||
| } |
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,118 @@ | ||
| // Licensed to the Software Freedom Conservancy (SFC) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The SFC licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| import React from "react"; | ||
| import PropTypes from "prop-types"; | ||
| import classNames from "classnames"; | ||
| import DeleteButton from "../ActionButtons/Delete"; | ||
| import { observer } from "mobx-react"; | ||
| import "./style.css"; | ||
|
|
||
| @observer | ||
| export default class Variable extends React.Component { | ||
| constructor(props){ | ||
| super(props); | ||
| this.handleKeyDown = this.handleKeyDown.bind(this); | ||
| this.handleChanged = this.handleChanged.bind(this); | ||
| this.keyChanged = this.keyChanged.bind(this); | ||
| this.valueChanged = this.valueChanged.bind(this); | ||
| this.delete = this.delete.bind(this); | ||
| this.edit = this.edit.bind(this); | ||
| this.state = { key: "", value: "" }; | ||
| } | ||
| componentDidMount() { | ||
| if (this.input) | ||
| this.input.focus(); | ||
| } | ||
| handleKeyDown(e) { | ||
| if (e.key === "Enter") { | ||
| e.preventDefault(); | ||
| const isValidKey = this.state.key || this.props.keyVar; | ||
| const isValidValue = this.state.value || this.props.value; | ||
| if (isValidKey && isValidValue) { | ||
| this.edit(isValidKey, isValidValue); | ||
| } | ||
| } | ||
| } | ||
| handleChanged() { | ||
| const isValidKey = this.state.key || this.props.keyVar; | ||
|
There was a problem hiding this comment. The naming convention is misleading, variables that begin with |
||
| const isValidValue = this.state.value || this.props.value; | ||
|
There was a problem hiding this comment. Why is empty string considered invalid? users can definitely store an empty string. |
||
| if (isValidKey && isValidValue) { | ||
| this.edit(isValidKey, isValidValue); | ||
| } else if (!(isValidKey || isValidValue)) { | ||
| this.props.setIsAdding(false); | ||
| } | ||
| } | ||
| delete() { | ||
| this.props.delete(this.props.keyVar); | ||
| } | ||
| edit(key, value){ | ||
| this.delete(); | ||
| this.props.add(key, value); | ||
| } | ||
| keyChanged(e) { | ||
| this.setState({ key: e.target.value }); | ||
| } | ||
| valueChanged(e) { | ||
| this.setState({ value: e.target.value }); | ||
| } | ||
| render() { | ||
| return ( | ||
| <li className="variable"> | ||
| {this.props.isAdding ? | ||
| <input | ||
|
There was a problem hiding this comment. What's the reason to use the default |
||
| ref={(input) => { this.input = input; }} | ||
| className="name isAdding" | ||
| onChange={this.keyChanged} | ||
| onKeyDown={this.handleKeyDown} | ||
| onBlur={this.handleChanged}/> | ||
| : | ||
| <input | ||
| className={classNames("name", { "editable": this.props.isStop })} | ||
| disabled={this.props.isStop ? false : true} | ||
| onChange={this.keyChanged} | ||
| value={this.state.key || this.props.keyVar} | ||
| onKeyDown={this.handleKeyDown} | ||
| onBlur={this.handleChanged}/>} | ||
| {this.props.isAdding ? | ||
| <input | ||
| className="value isAdding" | ||
| onChange={this.valueChanged} | ||
| onKeyDown={this.handleKeyDown} | ||
| onBlur={this.handleChanged} /> | ||
| : | ||
| <input | ||
| className={classNames("value", { "editable": this.props.isStop })} | ||
| disabled={this.props.isStop ? false : true} | ||
| onChange={this.valueChanged} | ||
| value={this.state.value || this.props.value} | ||
| onKeyDown={this.handleKeyDown} | ||
| onBlur={this.handleChanged} />} | ||
| <DeleteButton className="deleteBtn" data-place="left" onClick={this.delete} disabled={!this.props.isStop}/> | ||
| </li> | ||
| ); | ||
| } | ||
| static propTypes = { | ||
| keyVar: PropTypes.string, | ||
| value: PropTypes.string, | ||
| delete: PropTypes.func, | ||
| add: PropTypes.func, | ||
| isAdding: PropTypes.bool, | ||
| isStop: PropTypes.bool, | ||
| setIsAdding: PropTypes.func | ||
| }; | ||
| } | ||
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,49 @@ | ||
| .variable { | ||
| font-size: 12px; | ||
| word-break: break-all; | ||
| display: flex; | ||
| } | ||
|
|
||
| .variable .name, | ||
| .variable .value { | ||
| float: left; | ||
| padding: 4px 5px; | ||
| width: 48%; | ||
| text-align: left; | ||
| border: 1px transparent solid; | ||
| } | ||
|
|
||
| .variable:not(.value-header):hover { | ||
| background-color: #f3f3f3; | ||
| } | ||
|
|
||
| .variable .deleteBtn { | ||
| width: 4%; | ||
| font-size: 15px; | ||
| opacity: 0; | ||
| height: 20px; | ||
| } | ||
|
|
||
| .variable:hover .deleteBtn { | ||
| opacity: 1; | ||
| } | ||
|
|
||
| .variable input, | ||
| .variable input:disabled { | ||
| background-color: transparent; | ||
| } | ||
|
|
||
| .variable input:not(.isAdding) { | ||
| cursor: initial; | ||
| outline: 0; | ||
| } | ||
|
|
||
| .variable .isAdding { | ||
| margin: 0 2px; | ||
| } | ||
|
|
||
| .variable .editable:focus { | ||
| border: 1px #4ea1ff solid; | ||
| outline: 0; | ||
| background-color: white; | ||
| } |
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,78 @@ | ||
| // Licensed to the Software Freedom Conservancy (SFC) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The SFC licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| import React from "react"; | ||
| import PropTypes from "prop-types"; | ||
| import Variable from "../Variable"; | ||
| import { observer } from "mobx-react"; | ||
| import "./style.css"; | ||
|
|
||
| @observer | ||
| export default class VariableList extends React.Component { | ||
| constructor(props){ | ||
| super(props); | ||
| this.deleteVariable = this.deleteVariable.bind(this); | ||
| this.addVariable = this.addVariable.bind(this); | ||
| } | ||
| deleteVariable(key){ | ||
| this.props.variables.deleteVariable(key); | ||
| this.props.setIsAdding(false); | ||
| } | ||
| addVariable(key, value){ | ||
| this.props.variables.addVariable(key, value); | ||
| this.props.setIsAdding(false); | ||
| } | ||
|
|
||
| render() { | ||
| const variables = this.props.variables; | ||
| return ( | ||
| <form onSubmit={(e) => { e.preventDefault(); }}> | ||
| <ul className="value-list"> | ||
| {variables.storedVars.size == 0 ? null : | ||
| <li className="value-header variable"> | ||
| <strong className="name">Name</strong> | ||
| <strong className="value">Value</strong> | ||
| <div className="deleteBtn"/> | ||
| </li>} | ||
| {variables.storedVars.entries().sort().map((storedMap) => ( | ||
|
There was a problem hiding this comment. Keep them sorted via a computed property, either in the store, or in the component. |
||
| <Variable | ||
| key={Math.random()} | ||
|
There was a problem hiding this comment. This beats the purpose of having a |
||
| keyVar={storedMap[0]} | ||
| value={storedMap[1]} | ||
| add={this.addVariable} | ||
| delete={this.deleteVariable} | ||
| isStop={variables.isStop} | ||
| /> | ||
| ))} | ||
| { this.props.isAdding ? | ||
| <Variable | ||
| add={this.addVariable} | ||
| delete={this.deleteVariable} | ||
| isAdding={this.props.isAdding} | ||
| setIsAdding={this.props.setIsAdding} | ||
| isStop={variables.isStop} | ||
| /> : null} | ||
| </ul> | ||
| </form> | ||
| ); | ||
| } | ||
| static propTypes = { | ||
| variables: PropTypes.object, | ||
| isAdding: PropTypes.bool, | ||
| setIsAdding: PropTypes.func | ||
| }; | ||
| } | ||
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,11 @@ | ||
| .value-list { | ||
| text-align: left; | ||
| overflow-y: auto; | ||
| overflow-x: hidden; | ||
| display: flex; | ||
| flex-direction: column; | ||
| } | ||
|
|
||
| .value-list li:last-child { | ||
| margin-bottom: 3px; | ||
| } |
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
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.
Use a form's
onSubmitevent, instead of keydown and checking for the key enter.It is bypassing the browser default behavior.