handle custodian emails in query and display

DataBiosphere · Sep 14, 2023 · ae818eb · ae818eb
1 parent ee053c4
commit ae818eb
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/src/pages/data_submitter_console/DataSubmitterConsole.jsx b/src/pages/data_submitter_console/DataSubmitterConsole.jsx
@@ -31,8 +31,30 @@ export default function DataSubmitterConsole() {
                 }
               },
               {
-                'term': {
-                  'createUserId': { 'value': user.userId }
+                'bool': {
+                  'should': [
+                    {
+                      'term': {
+                        'createUserId': {
+                          'value': user.userId
+                        }
+                      }
+                    },
+                    {
+                      'term': {
+                        'study.dataSubmitterId': {
+                          'value': user.userId
+                        }
+                      }
+                    },
+                    {
+                      'term': {
+                        'study.dataCustodianEmail': {
+                          'value': user.email
+                        }
+                      }
+                    }
+                  ]
                 }
               }
             ]

diff --git a/src/pages/data_submitter_console/DataSubmitterDatasetsTable.jsx b/src/pages/data_submitter_console/DataSubmitterDatasetsTable.jsx
@@ -91,11 +91,12 @@ export default function DataSubmitterDatasetsTable(props) {
             Edit
           </Button>
         </div>;
+      const custodians = join(', ')(term.study?.dataCustodianEmail);
       return {
         datasetIdentifier: term.datasetIdentifier,
         datasetName: term.datasetName,
         dataSubmitter: term?.createUserDisplayName,
-        datasetCustodians: '',
+        datasetCustodians: custodians,
         dac: term.dacName,
         dataUse: join(', ')(concat(primaryCodes)(secondaryCodes)),
         status: status,