Merge pull request #96 from multinet-app/csv_validation

Specify which keys are duplicate and fix front-end bug

client/src/views/WorkspaceDetail.vue

@@ -94,7 +94,7 @@
             <v-card-text>
               <v-layout row wrap>
                 <v-flex>
-                  <v-text-field v-model="newTable" placeholder="name your table" solo :error-messages="tableCreationErrors"/>
+                  <v-text-field v-model="newTable" placeholder="name your table" solo :error-messages="tableCreationError"/>
                 </v-flex>
               </v-layout>
               <v-layout row wrap>
@@ -205,7 +205,7 @@ export default {
       selectedType: null,
       graphNodeTables: [],
       graphEdgeTable: null,
-      tableCreationErrors: [],
+      tableCreationError: null,
     }
   },
   computed: {
@@ -268,10 +268,10 @@ export default {
           },
         }
         );
-        this.tableCreationErrors = [];
+        this.tableCreationError = null;
         this.update()
       } catch(err) {
-        this.tableCreationErrors.push(err.response.data.message);
+        this.tableCreationError = err.response.data.message;
       }
     },
 

multinet/multinet/__init__.py

@@ -31,6 +31,23 @@ def graphql_query(query, variables=None):
     return dict(data=result.data, errors=errors, query=query)
 
 
+def validate_csv(rows):
+    """Perform any necessary CSV validation, and raise appropriate exceptions."""
+    # Check for key uniqueness
+    if ('_key' in rows.fieldnames):
+        keys = [row['_key'] for row in rows]
+        uniqueKeys = set()
+        duplicates = set()
+        for key in keys:
+            if key in uniqueKeys:
+                duplicates.add(key)
+            else:
+                uniqueKeys.add(key)
+
+        if (len(duplicates) > 0):
+            raise RestException(f'CSV Validation Failed: Duplicate Keys {", ".join(duplicates)}.')
+
+
 class MultiNet(Resource):
     """Define the MultiNet API within Girder."""
 
@@ -95,12 +112,8 @@ def bulk(self, params, workspace=None, table=None):
         rows = csv.DictReader(StringIO(cherrypy.request.body.read().decode('utf8')))
         workspace = db.db(workspace)
 
-        # Check for key uniqueness
-        if ('_key' in rows.fieldnames):
-            keys = [row['_key'] for row in rows]
-            uniqueKeys = set(keys)
-            if len(keys) != len(uniqueKeys):
-                raise RestException('CSV Validation Failed: Non-unique key detected.')
+        # Do any CSV validation necessary, and raise appropriate exceptions
+        validate_csv(rows)
 
         # Set the collection, paying attention to whether the data contains
         # _from/_to fields.