@teselagen/ove 0.3.13 → 0.3.14

package/src/helperComponents/AddOrEditAnnotationDialog/index.js

@@ -39,7 +39,7 @@ import { store, view } from "@risingstack/react-easy-state";
 
 import withEditorProps from "../../withEditorProps";
 import { withProps } from "recompose";
-import { map, flatMap } from "lodash";
+import { map, flatMap, round } from "lodash";
 import "./style.css";
 
 class AddOrEditAnnotationDialog extends React.Component {
@@ -58,30 +58,30 @@ class AddOrEditAnnotationDialog extends React.Component {
   formatStart = val => {
     const { isProtein } = this.props.sequenceData || {};
     if (isProtein) {
-      return (val + 2) / 3;
+      return round((val + 2) / 3);
     }
-    return val;
+    return round(val);
   };
   formatEnd = val => {
     const { isProtein } = this.props.sequenceData || {};
     if (isProtein) {
-      return val / 3;
+      return round(val / 3);
     }
-    return val;
+    return round(val);
   };
   parseStart = val => {
     const { isProtein } = this.props.sequenceData || {};
     if (isProtein) {
-      return val * 3 - 2;
+      return round(val * 3 - 2);
     }
-    return val;
+    return round(val);
   };
   parseEnd = val => {
     const { isProtein } = this.props.sequenceData || {};
     if (isProtein) {
-      return val * 3;
+      return round(val * 3);
     }
-    return val;
+    return round(val);
   };
   renderLocations = props => {
     const { fields } = props;

package/src/helperComponents/PropertiesDialog/GeneralProperties.js

@@ -105,7 +105,6 @@ class GeneralProperties extends React.Component {
                 className={"veReadOnlySelect"}
                 disabled={!onSave || disableSetReadOnly}
                 onChange={val =>
-                  console.log(`val:`, val) ||
                   handleReadOnlyChange(val === "readOnly", this.props)
                 }
                 value={readOnly ? "readOnly" : "editable"}

package/src/withEditorProps/index.js

@@ -571,6 +571,7 @@ function mapStateToProps(state, ownProps) {
   if (!editorState) {
     return editorReducer({}, {});
   }
+  const sequenceLength = s.sequenceLengthSelector(editorState);
 
   const { findTool, annotationsToSupport = {} } = editorState;
   const visibilities = getVisibilities(editorState);
@@ -582,7 +583,13 @@ function mapStateToProps(state, ownProps) {
   ].forEach(([n, type, annotationTypePlural]) => {
     const vals = getFormValues(n)(state);
     if (vals) {
-      annotationToAdd = getAnnToAdd(vals, n, type, annotationTypePlural);
+      annotationToAdd = getAnnToAdd(
+        vals,
+        n,
+        type,
+        annotationTypePlural,
+        sequenceLength
+      );
     }
   });
 
@@ -613,7 +620,6 @@ function mapStateToProps(state, ownProps) {
     editorState,
     ownProps.additionalEnzymes
   );
-  const sequenceLength = s.sequenceLengthSelector(editorState);
 
   const { matchedSearchLayer, searchLayers, matchesTotal } =
     getSearchLayersAndMatch(editorState);
@@ -955,22 +961,28 @@ const getFindTool = createSelector(
   }
 );
 
-const getAnnToAdd = defaultMemoize((vals, n, type, annotationTypePlural) => {
-  const annToAdd = {
-    color: getFeatureToColorMap({ includeHidden: true })[
-      vals.type || "primer_bind"
-    ], //we won't have the correct color yet so we set it here
-    ...vals,
-    formName: n,
-    type,
-    annotationTypePlural,
-    name: vals.name || "Untitled"
-  };
-  if (!vals.useLinkedOligo) {
-    delete annToAdd.bases;
+const getAnnToAdd = defaultMemoize(
+  (vals, n, type, annotationTypePlural, sequenceLength) => {
+    const annToAdd = normalizeRange(
+      {
+        color: getFeatureToColorMap({ includeHidden: true })[
+          vals.type || "primer_bind"
+        ], //we won't have the correct color yet so we set it here
+        ...vals,
+        formName: n,
+        type,
+        annotationTypePlural,
+        name: vals.name || "Untitled"
+      },
+      sequenceLength
+    );
+
+    if (!vals.useLinkedOligo) {
+      delete annToAdd.bases;
+    }
+    return annToAdd;
   }
-  return annToAdd;
-});
+);
 const getSeqDataWithAnnToAdd = defaultMemoize(
   (seqData, ann, allowMultipleFeatureDirections) => {
     if (ann) {