Merge branch '5.8.2'

JBEI · Jan 7, 2021 · 5b87173 · 5b87173
2 parents 76d5242 + 0b275b5
commit 5b87173
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.jbei</groupId>
     <artifactId>ice</artifactId>
     <packaging>war</packaging>
-    <version>5.8.1</version>
+    <version>5.8.2</version>
     <name>ice</name>
     <description>Inventory of Composable Elements (ICE) for Synthetic Biology</description>
     <repositories>

diff --git a/src/main/java/org/jbei/ice/lib/config/SiteSettings.java b/src/main/java/org/jbei/ice/lib/config/SiteSettings.java
@@ -9,7 +9,7 @@
  */
 public class SiteSettings implements IDataTransferModel {
 
-    private String version = "5.8.1";
+    private String version = "5.8.2";
     private String assetName;
     private boolean hasLogo;
     private boolean hasLoginMessage;

diff --git a/src/main/java/org/jbei/ice/lib/entry/sequence/PartSequence.java b/src/main/java/org/jbei/ice/lib/entry/sequence/PartSequence.java
@@ -362,6 +362,18 @@ private void checkForUpdatedFeatures(Sequence existing, Sequence updated) {
             // for each existing feature, check with updated for difference in name and type
             for (SequenceFeature updatedSequenceFeature : updated.getSequenceFeatures()) {
                 Feature sequenceFeature = updatedSequenceFeature.getFeature();
+                Feature existingFeatureFeature = existingFeature.getFeature();
+
+                if (!sequenceFeature.getHash().equals(existingFeatureFeature.getHash()))
+                    continue;
+
+                if (!sequenceFeature.getName().equals(existingFeatureFeature.getName()) ||
+                        !sequenceFeature.getGenbankType().equals(existingFeatureFeature.getGenbankType())) {
+                    // update
+                    existingFeatureFeature.setName(sequenceFeature.getName());
+                    existingFeatureFeature.setGenbankType(sequenceFeature.getGenbankType());
+                    featureDAO.update(existingFeatureFeature);
+                }
             }
         }
     }

diff --git a/src/main/java/org/jbei/ice/lib/entry/sequence/SequenceUtil.java b/src/main/java/org/jbei/ice/lib/entry/sequence/SequenceUtil.java
@@ -137,7 +137,8 @@ static FeaturedDNASequence sequenceToDNASequence(Sequence sequence, List<Sequenc
 
                 dnaFeature.setId(sequenceFeature.getId());
                 dnaFeature.setType(sequenceFeature.getGenbankType());
-                dnaFeature.setName(sequenceFeature.getName());
+                String name = sequenceFeature.getFeature() != null ? sequenceFeature.getFeature().getName() : sequenceFeature.getName();
+                dnaFeature.setName(name);
                 dnaFeature.setStrand(sequenceFeature.getStrand());
 
                 if (sequenceFeature.getAnnotationType() != null) {

diff --git a/src/main/webapp/scripts/entry/entryController.js b/src/main/webapp/scripts/entry/entryController.js
@@ -647,12 +647,22 @@ angular.module('ice.entry.controller', [])
                                         type: feature.type,
                                         name: feature.name,
                                         strand: feature.forward ? 1 : -1,
-                                        notes: [{name: "note", value: feature.notes}],
                                         locations: [{
                                             genbankStart: feature.start + 1,
                                             end: feature.end + 1
                                         }]
                                     };
+
+                                    // set notes
+                                    if (feature.notes) {
+                                        featureMap[feature.id].notes = [];
+                                        for (const prop in feature.notes) {
+                                            if (!feature.notes.hasOwnProperty(prop))
+                                                continue;
+
+                                            featureMap[feature.id].notes.push({name: "note", value: prop})
+                                        }
+                                    }
                                 }
                             }
 
@@ -663,6 +673,8 @@ angular.module('ice.entry.controller', [])
                                 sequence.features.push(featureMap[property]);
                             }
 
+                            console.log(sequence.features);
+
                             Util.update("rest/parts/" + entry.id + "/sequence", sequence, {},
                                 function (result) {
                                     console.log("save completed for", entry.id);

diff --git a/src/main/webapp/views/footer.html b/src/main/webapp/views/footer.html
@@ -11,7 +11,7 @@
     </div>
     <div class="text-right" style="white-space: nowrap;">
         &copy;&nbsp;<a href="https://github.com/JBEI/ice">JBEI ICE Registry</a> <span
-            class="label label-primary">5.8.1</span><br>
+            class="label label-primary">5.8.2</span><br>
         All rights reserved. <br>
         <a href="https://github.com/JBEI/ice/issues/new">Submit an Issue</a>&nbsp; <span class="text-muted">|</span>
         &nbsp;<a href="http://ice.jbei.org/">Help</a>