Merge pull request #1259 from SynBioHub/createCollection

Modifications to make create collection more clear

Author: cjmyers

lib/app.js

@@ -250,13 +250,11 @@ function App () {
   app.get('/searchCount/:query?', views.search)
   app.get('/remoteSearch/:query?', forceNoHTML, views.search) /// DEPRECATED, use /search
 
-  app.get('/advancedSearch', views.advancedSearch)
-  app.post('/advancedSearch', views.advancedSearch)
-
   app.get('/sbsearch', views.sbsearch)
   app.post('/sbsearch', views.sbsearch)
 
-  app.get('/createCollection', views.advancedSearch)
+  app.get('/advancedSearch', views.advancedSearch)
+  app.post('/advancedSearch', views.advancedSearch)
   app.post('/createCollection', views.advancedSearch)
 
   app.get('/:type/count', api.count)

lib/views/advancedSearch.js

@@ -24,7 +24,7 @@ module.exports = function (req, res) {
     if (req.body.adv.startsWith('Filter')) {
       advancedSearchForm(req, res, {}, [])
     } else {
-      if (req.originalUrl.endsWith('/createCollection')) {
+      if (req.body.adv === 'Create' || req.originalUrl.endsWith('/createCollection')) {
         var errors = checkCollectionMeta(req, res)
         if (errors.length > 0) {
           advancedSearchForm(req, res, {}, errors)
@@ -114,11 +114,7 @@ function advancedSearchForm (req, res, locals, errors) {
       objects4: lists.object4List,
       objects5: lists.object5List
     }, locals)
-    if (req.originalUrl.endsWith('/createCollection')) {
-      res.send(pug.renderFile('templates/views/createCollection.jade', locals))
-    } else {
-      res.send(pug.renderFile('templates/views/advanced-search.jade', locals))
-    }
+    res.send(pug.renderFile('templates/views/advanced-search.jade', locals))
   }).catch((err) => {
     locals = {
       config: config.get(),
@@ -227,15 +223,15 @@ function advancedSearchPost (req, res) {
       user: req.user
     }
 
-    if (req.originalUrl.endsWith('/createCollection')) {
+    if (req.body.adv === 'Create' || req.originalUrl.endsWith('/createCollection')) {
       limit = 10000
     }
 
     return search(null, criteria, req.query.offset, limit, req.user).then((searchRes) => {
       const count = searchRes.count
       const results = searchRes.results
 
-      if (req.originalUrl.endsWith('/createCollection')) {
+      if (req.body.adv === 'Create' || req.originalUrl.endsWith('/createCollection')) {
         var sbol = new Sboljs()
         var collection = sbol.collection()
         collection.displayId = req.body.metaId + '_collection'

templates/views/advanced-search.jade

@@ -2,53 +2,22 @@
 extends ../layouts/default.jade
 include ../mixins/advanced-search-filter.jade
 
-block head
-    style.
-        body {
-            background-color: #f6f6f6;
-        }
-
-        .grey-page-mark {
-            background-color: #f6f6f6;
-        }
-
-        .top-search-form {
-            display: none;
-        }
-
-        .main-search-form input {
-            width: 60%;
-            margin-left: 0;
-            background-color: white;
-            padding: 14px 16px 13px 32px;
-        }
-
-        .main-search-form .submit {
-            padding: 12px 21px;
-        }
-
-        .main-search-form label {
-            color: #7F8C8D;
-        }
-
-        .search-section {
-            height: 60px;
-            padding: 20px;
-            margin: 0 auto;
-            width: 60%;
-            margin-bottom: 40px;
-            text-align: center;
-        }
-
 block breadcrumbs
     ul
         li.inactive
             span.fa.fa-search
-            |  Advanced Search
+            |  Create Collection
 
 block content
   div.submission-container(align='center')
     form(name="advancedSearch", method="post").submission-form
+
+        if errors.length > 0
+            each error in errors
+                div.alert.alert-danger
+                    p #{error}
+                br
+
         div.form-group-50.required
             table.table.advanced-search-table
                 th Property
@@ -119,12 +88,44 @@ block content
 
         div.clearfix
 
-        br
-        br
-
         button(type='submit',name="adv",value="Search").btn.btn-primary.btn-lg
             | Search
 
+        if locals.user
+            div.row
+                div.col-md-12
+                    div.form-group-100.required
+                        label(for="name") Collection Name 
+                            a(href="http://wiki.synbiohub.org/wiki/Terms/SynBioHub#Name",title='SynBioHub organizes objects into collections.  You can put as many objects as you want into one collection, and then conveniently download them all together or share the collection as a whole with other people.')
+                                span.fa.fa-info-circle
+                            input.form-control(name='metaName',id="metaName",placeholder='A short title for your collection.  You can use spaces and symbols here.',value=collectionMeta.name,style="width: 675px;")
+            div.row
+                div.col-md-12
+                    div.form-group-100.required
+                        label(for="description") Collection Description
+                            textarea.form-control(name='metaDescription', id="metaDescription" placeholder='The more you say, the easier it will be to find your design.',value=collectionMeta.description,style="width: 675px;")
+                                 | #{collectionMeta.description}
+
+            div.row
+                div.col-md-6
+                    div.form-group-100.required
+                        label(for="id") Collection Id  
+                            a(href="http://wiki.synbiohub.org/wiki/Terms/SynBioHub#Id",title='An id is a string of characters that MUST be composed of only alphanumeric or underscore characters and MUST NOT begin with a digit.')
+                                span.fa.fa-info-circle
+                        input.form-control(type='text', id="metaId", name='metaId',placeholder='Just letters and numbers, no spaces',value=collectionMeta.id)
+                div.col-md-6
+                    div.form-group-100.required
+                        label(for='version') Collection Version 
+                            a(href="http://wiki.synbiohub.org/wiki/Terms/SynBioHub#Version",title='A version is a string of characters that MUST be composed of only alphanumeric characters, underscores, hyphens, or periods and MUST begin with a digit.')
+                                span.fa.fa-info-circle
+                        input.form-control(type='text', id='metaVersion', name='metaVersion',placeholder='Version',value=collectionMeta.version)
+
+            div.clearfix
+            br
+
+            button(type='submit',name="adv",value="Create").btn.btn-primary.btn-lg
+                | Create Collection
+
 
 
 

templates/views/createCollection.jade

@@ -60,9 +60,6 @@ block content
         |  |  
         a(href='/advancedSearch') Advanced Search
         |  |  
-        if (locals.user)
-            a(href='/createCollection') Create Collection
-            |  |  
         a(href='/sparql') SPARQL
         br
 

templates/views/search.jade

@@ -21,7 +21,7 @@ block content
 
             ul.nav.nav-tabs(role="tablist")
                 li.active(role="presentation")
-                    a(data-toggle="tab", href="#new", role="tab", aria-controls="new") Submit to New Collection
+                    a(data-toggle="tab", href="#new", role="tab", aria-controls="new") Create a New Collection
                 li(role="presentation")
                     a(data-toggle="tab", href="#existing", role="tab", aria-controls="existing") Submit to Existing Collection
 
@@ -82,7 +82,7 @@ block content
                         div.row
                             div.col-md-12
                                 div.form-group-100
-                                   label SBOL/GenBank/FASTA/ZIP File
+                                   label SBOL/GenBank/GFF3/FASTA/ZIP File (optional)
                                    br
                                    input(type='file',name='file',value=submission.file)
 
@@ -130,7 +130,7 @@ block content
                         div.row
                             div.col-md-12
                                 div.form-group.required
-                                   label SBOL/GenBank/FASTA/ZIP File
+                                   label SBOL/GenBank/GFF3/FASTA/ZIP File
                                    input(type='file',name='file',value=submission.file)
 
                         div.row