Merge pull request #17 from KPMP/KPMP-1883_AddSampleId

KPMP-1883: Added subject id and ran npm audit fix
KPMP · Jun 8, 2020 · 1d0e9d6 · 1d0e9d6
2 parents a1586d1 + 2d5e1fe
commit 1d0e9d6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,5 +14,4 @@ notifications:
   email:
     - [email protected]
     - [email protected]
-    - [email protected]
     - [email protected]
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "redux-thunk": "2.3.0"
   },
   "devDependencies": {
-    "node-sass-chokidar": "1.3.5",
+    "node-sass-chokidar": "^1.4.0",
     "npm-run-all": "4.1.5"
   },
   "scripts": {

diff --git a/src/App.test.js b/src/App.test.js
diff --git a/src/components/PackageDashboard/PackageTable.js b/src/components/PackageDashboard/PackageTable.js
@@ -11,6 +11,7 @@ const SUBMITTER_LABEL = "Submitter";
 const TIS_NAME_LABEL = "TIS Name";
 const DATE_SUBMITTED_LABEL = "Date Submitted";
 const PACKAGE_STATE_LABEL = "Package State";
+const SUBJECT_ID_LABEL = "Subject Id";
 
 const PACKAGE_ID = "_id";
 const SUBMITTER_ID = "displayName";
@@ -22,6 +23,7 @@ const DATE_SUBMITTED_ID = "createdAt";
 const DATE_FORMAT = "YYYY-MM-DD, h:mm a z";
 const PACKAGE_INFO_PROPERTY = "packageInfo";
 const PACKAGE_STATE_ID = "state";
+const SUBJECT_ID = "subjectId";
 
 // package id, submitter, package type, tis name, date submitted
 class PackageTable extends Component {
@@ -50,6 +52,11 @@ class PackageTable extends Component {
                 id: PACKAGE_ID,
                 accessor: (row) => row[PACKAGE_INFO_PROPERTY][PACKAGE_ID]
             },
+            {
+            	Header: SUBJECT_ID_LABEL,
+            	id: SUBJECT_ID,
+            	accessor: (row) => row[PACKAGE_INFO_PROPERTY][SUBJECT_ID]
+            },
             {
                 Header: PACKAGE_TYPE_LABEL,
                 id: PACKAGE_TYPE_ID,
@@ -85,6 +92,7 @@ class PackageTable extends Component {
                     return ""
                 }
             }
+
         ];
     }