- {
- (this.state && this.state.activeGM) ?
+ {(this.props.selected_graphics_type &&
+ this.props.selected_graphics_method &&
+ this.props.graphics_methods[this.props.selected_graphics_type][this.props.selected_graphics_method]) ?
:
""
}
+ { this.state.show_create_modal &&
+
{this.setState({show_create_modal: false})}}
+ graphics_methods={this.props.graphics_methods}
+ selectGM={this.props.selectGraphicsMethod}
+ />
+ }
+
)
}
}
GMList.propTypes = {
- graphicsMethods: PropTypes.object,
- updateGraphicsMethod: PropTypes.func,
+ graphics_methods: PropTypes.object,
colormaps: PropTypes.object,
+ updateGraphicsMethod: PropTypes.func,
+ selectGraphicsMethod: PropTypes.func,
+ removeGraphicsMethod: PropTypes.func,
+ selected_graphics_method: PropTypes.string,
+ selected_graphics_type: PropTypes.string,
+}
+
+const mapStateToProps = (state) => {
+ return {
+ graphics_methods: state.present.graphics_methods,
+ selected_graphics_method: state.present.ui.selected_graphics_method,
+ selected_graphics_type: state.present.ui.selected_graphics_type,
+ }
+}
+
+const mapDispatchToProps = (dispatch) => {
+ return {
+ updateGraphicsMethod: (graphics_method) => {
+ dispatch(Actions.updateGraphicsMethod(graphics_method))
+ },
+ selectGraphicsMethod: (type, name) => {
+ dispatch(Actions.selectGraphicsMethod(type, name))
+ },
+ removeGraphicsMethod: (type, name) => {
+ dispatch(Actions.removeGraphicsMethod(type, name))
+ }
+ }
}
-export default GMList
+export default connect(mapStateToProps, mapDispatchToProps)(GMList)
diff --git a/frontend/src/js/components/TemplateList.jsx b/frontend/src/js/components/TemplateList.jsx
index 01eef43..662cceb 100644
--- a/frontend/src/js/components/TemplateList.jsx
+++ b/frontend/src/js/components/TemplateList.jsx
@@ -62,7 +62,15 @@ class TemplateList extends Component {
else{
this.setState({showTemplateEditor: true, template_data: "loading"})
return vcs.gettemplate(this.props.selected_template).then((data)=>{ // return promise for testing purposes
- this.setState({template_data: data})
+ if(data) {
+ this.setState({template_data: data})
+ }
+ else { // data will be null if the selected template doesnt exist
+ // We can probably do more error handling here. Refresh the names, and deselect the selected template
+ toast.error(`${this.props.selected_template} doesn't exist on the server. Try refreshing the browser window.`,
+ { position: toast.POSITION.BOTTOM_CENTER }
+ )
+ }
},
(error) => {
console.warn(error)
diff --git a/frontend/src/js/components/modals/GraphicsMethodCreator.jsx b/frontend/src/js/components/modals/GraphicsMethodCreator.jsx
new file mode 100644
index 0000000..093fdc1
--- /dev/null
+++ b/frontend/src/js/components/modals/GraphicsMethodCreator.jsx
@@ -0,0 +1,198 @@
+import React, { Component } from "react";
+import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import Actions from "../../constants/Actions.js";
+import { Modal, Button, FormGroup, FormControl, ControlLabel, HelpBlock, Row, Col } from "react-bootstrap";
+import { toast } from "react-toastify";
+
+class GraphicsMethodCreator extends Component {
+ constructor(props) {
+ super(props);
+ let default_gm_type = "";
+ let default_gm_method = "";
+ const gm_types = Object.keys(props.graphics_methods);
+
+ if (gm_types.length > 0) {
+ default_gm_type = Object.keys(props.graphics_methods)[0]; // just grab the first one each time since there isnt really a default
+ }
+
+ if (default_gm_type) {
+ // can't select a graphics method if the types weren't defined
+ const gm_methods = Object.keys(props.graphics_methods[default_gm_type]);
+ if (gm_methods.indexOf("default") >= 0) {
+ default_gm_method = "default";
+ } else if (gm_methods.length > 0) {
+ default_gm_method = gm_methods[0];
+ }
+ }
+
+ this.state = {
+ new_gm_name: "",
+ validation_state: null,
+ selected_gm_type: default_gm_type,
+ selected_gm_method: default_gm_method,
+ error_message: ""
+ };
+
+ this.createGraphicsMethod = this.createGraphicsMethod.bind(this);
+ this.handleChange = this.handleChange.bind(this);
+ this.handleKeyPress = this.handleKeyPress.bind(this)
+ }
+
+ handleChange(event) {
+ const name = event.target.value;
+ const { status: validation_state, message } = this.getValidationState(name, this.state.selected_gm_type);
+ this.setState({ new_gm_name: name, validation_state: validation_state, error_message: message });
+ }
+
+ handleKeyPress(event) {
+ if(event.charCode === 13 && this.state.validation_state === "success") {
+ this.createGraphicsMethod()
+ }
+ }
+
+ getValidationState(name, gm_type) {
+ // Checks if the given input is a valid name for a new GM
+ // returns an object with the following keys:
+ // status: A string or null that indicates the validity of the input
+ // message: A string that contains the error message to display when the status is "error"
+ if (name.length === 0 || gm_type === "") {
+ return { status: null, message: "" };
+ } else if (Object.keys(this.props.graphics_methods[gm_type]).indexOf(name) > -1) {
+ return { status: "error", message: "A Graphics Method with that name already exists" };
+ } else if (name.startsWith("__")) {
+ return { status: "error", message: "Graphics Method names should not start with two underscores" };
+ }
+ return { status: "success", message: "" };
+ }
+
+ createGraphicsMethod() {
+ try {
+ return vcs.creategraphicsmethod(this.state.selected_gm_type, this.state.new_gm_name, this.state.selected_gm_method).then(
+ (/* success */) => {
+ this.props.createGraphicsMethod(this.state.new_gm_name, this.state.selected_gm_type, this.state.selected_gm_method);
+ toast.success("Graphics Method created successfully!", { position: toast.POSITION.BOTTOM_CENTER });
+ this.props.close();
+ },
+ /* istanbul ignore next */
+ error => {
+ console.warn("Error while creating Graphics Method: ", error);
+ try {
+ toast.error(error.data.exception, { position: toast.POSITION.BOTTOM_CENTER });
+ } catch (e) {
+ toast.error("Failed to create Graphics Method", { position: toast.POSITION.BOTTOM_CENTER });
+ }
+ }
+ );
+ } catch (e) {
+ /* istanbul ignore next */
+ console.warn(e);
+ /* istanbul ignore next */
+ toast.error("An error occurred while creating the Graphics Method. Try restarting vCDAT.");
+ }
+ }
+
+ render() {
+ return (
+