@@ -254,59 +258,80 @@ let AddAdditionalEnzyme = function(props) {
);
};
-AddAdditionalEnzyme = connect(
+CreateYouOwnEnzyme = connect(
function(state) {
return {
- addAdditionalEnzymes:
- state.VectorEditor.__allEditorsOptions.addAdditionalEnzymes
+ createYourOwnEnzyme:
+ state.VectorEditor.__allEditorsOptions.createYourOwnEnzyme
};
},
- { addAdditionalEnzymesClose }
-)(AddAdditionalEnzyme);
+ { createYourOwnEnzymeClose }
+)(CreateYouOwnEnzyme);
-class AddAdditionalEnzymes extends React.Component {
+class ManageEnzymes extends React.Component {
state = {
- addAdditionalEnzymes: false,
+ createYourOwnEnzyme: false,
enzymesToAdd: []
};
+ handleChange = () => {};
startAddingYourOwnEnzyme = () => {
- this.setState({ addAdditionalEnzymes: true });
+ this.setState({ createYourOwnEnzyme: true });
};
- stopAddingYourOwnEnzyme = () => {
- this.setState({ addAdditionalEnzymes: false });
+ stopCreatingYourOwnEnzyme = () => {
+ this.setState({ createYourOwnEnzyme: false });
};
render() {
- if (this.state.addAdditionalEnzymes) {
+ if (this.state.createYourOwnEnzyme) {
return (
-
);
}
const {
dispatch,
- addAdditionalEnzymesClose: hideModal,
- inputSequenceToTestAgainst = ""
+ createYourOwnEnzymeClose: hideModal,
+ // inputSequenceToTestAgainst = "",
+ selectedEnzymes
} = this.props;
+
+ const selectedItems = [];
+ const allEnzymes = map(enzymeListFull, function(enzyme) {
+ const inList = selectedEnzymes[enzyme.name.toLowerCase()];
+ const o = {
+ label: enzyme.name,
+ id: enzyme
+ };
+ if (inList) {
+ selectedItems.push(o);
+ }
+
+ return o;
+ });
+
const { enzymesToAdd } = this.state;
return (
-
Add additional enzymes
+
Manage enzymes
Our default list contains just the most common enzymes. Search here to
add less common ones:
-
+ {/*
{
this.setState({
enzymesToAdd: enzymesToAdd.map(function({ value }) {
@@ -325,7 +350,7 @@ class AddAdditionalEnzymes extends React.Component {
});
}}
value={enzymesToAdd}
- />
+ /> */}
}
- options={flatMap(features, feat => {
+ options={flatMap(features, (feat) => {
if (feat.id === (feat2 && feat2.id)) return []; //filter out other feature as an option
return {
value: feat.id,
@@ -141,7 +141,7 @@ export class MergeFeaturesDialog extends React.Component {
}
- options={flatMap(features, feat => {
+ options={flatMap(features, (feat) => {
if (feat.id === (feat1 && feat1.id)) return []; //filter out other feature as an option
return {
value: feat.id,
diff --git a/src/helperComponents/PropertiesDialog/CutsiteProperties.js b/src/helperComponents/PropertiesDialog/CutsiteProperties.js
index 561a57d2a..930382296 100644
--- a/src/helperComponents/PropertiesDialog/CutsiteProperties.js
+++ b/src/helperComponents/PropertiesDialog/CutsiteProperties.js
@@ -6,7 +6,7 @@ import {
} from "teselagen-react-components";
import { map, get } from "lodash";
import EnzymeViewer from "../../EnzymeViewer";
-import enzymeList from "../../redux/utils/defaultEnzymeList.json";
+import enzymeList from "../../redux/utils/defaultEnzymeList.js";
import CutsiteFilter from "../../CutsiteFilter";
import { Button } from "@blueprintjs/core";
import { connectToEditor } from "../../withEditorProps";
diff --git a/src/helperComponents/PropertiesDialog/OrfProperties.js b/src/helperComponents/PropertiesDialog/OrfProperties.js
index ac24a1e06..80a41a60a 100644
--- a/src/helperComponents/PropertiesDialog/OrfProperties.js
+++ b/src/helperComponents/PropertiesDialog/OrfProperties.js
@@ -50,7 +50,7 @@ class OrfProperties extends React.Component {