Merge pull request #419 from dbmi-bgm/pedigree-upload-checkbox

Pedigree upload checkbox for dragndrop
dbmi-bgm · Jul 1, 2021 · 7a67b8b · 7a67b8b
2 parents c22f9c2 + d1605b1
commit 7a67b8b
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.14.0",
     "@hms-dbmi-bgm/react-workflow-viz": "0.1.4",
-    "@hms-dbmi-bgm/shared-portal-components": "github:4dn-dcic/shared-portal-components#0.1.6",
+    "@hms-dbmi-bgm/shared-portal-components": "github:4dn-dcic/shared-portal-components#0.1.11",
     "babel-polyfill": "^6.26.0",
     "d3": "^5.16.0",
     "detect-browser": "^3.0.1",

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 # Note: Various modules refer to this system as "encoded", not "cgap-portal".
 name = "encoded"
-version = "6.8.10"
+version = "6.8.11"
 description = "Clinical Genomics Analysis Platform"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"

diff --git a/src/encoded/nginx-dev.conf b/src/encoded/nginx-dev.conf
@@ -30,4 +30,5 @@ http {
           proxy_pass $1$is_args$args;
       }
     }
+    client_max_body_size 0;
 }
diff --git a/src/encoded/static/components/item-pages/components/PedigreeDetailPane/Files.js b/src/encoded/static/components/item-pages/components/PedigreeDetailPane/Files.js
@@ -73,7 +73,7 @@ function FileArrayField (props) {
     return (
         <div className="detail-row" data-describing={fieldDisplayTitle}>
             <label className="d-block">{fieldDisplayTitle}</label>
-            <ul>
+            <ul className="mb-05">
                 { files.map(function({ "@id" : fileID, display_title: fileDisplayTitle }){
                     return (
                         <li key={fileID}>
@@ -84,7 +84,8 @@ function FileArrayField (props) {
             </ul>
             { haveEditPermission ?
                 <DragAndDropFileUploadController {...{ fieldDisplayTitle, fieldType, fieldName, individualId, project, institution, fileSchema, files }}
-                    award={null} lab={null} cls="btn btn-sm btn-outline-dark" />
+                    award={null} lab={null} multiselect cls="btn btn-sm btn-outline-dark mt-05"
+                    requestVerificationMsg={<span>I certify that my file(s) do not contain <a href="https://www.hipaajournal.com/considered-phi-hipaa/" target="_blank" rel="noreferrer">Personal Health Information</a></span>}/>
                 : null }
         </div>
     );
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,4 +30,5 @@ http { @@
               proxy_pass $1$is_args$args;
           }
         }
+        client_max_body_size 0;
     }