HARMONY-398: Only send disallowUser for admins

nasa · Oct 11, 2023 · 2b1cc67 · 2b1cc67
1 parent ebc2f4f
commit 2b1cc67
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/public/js/workflow-ui/jobs/index.js b/public/js/workflow-ui/jobs/index.js
@@ -3,14 +3,19 @@ import JobsStatusChangeLinks from './jobs-status-change-links.js';
 import toasts from '../toasts.js';
 
 const params = {};
-params.disallowStatus = document.getElementsByName('disallowStatus')[0].checked ? 'on' : '';
-params.disallowService = document.getElementsByName('disallowService')[0].checked ? 'on' : '';
-params.disallowUser = document.getElementsByName('disallowUser')[0].checked ? 'on' : '';
+
 const tableFilter = document.querySelector('input[name="tableFilter"]');
+const isAdminRoute = tableFilter.getAttribute('data-is-admin-route') === 'true';
+params.isAdminRoute = isAdminRoute;
 params.tableFilter = tableFilter.getAttribute('data-value');
 params.currentUser = tableFilter.getAttribute('data-current-user');
 params.services = JSON.parse(tableFilter.getAttribute('data-services'));
-params.isAdminRoute = tableFilter.getAttribute('data-is-admin-route') === 'true';
+
+params.disallowStatus = document.getElementsByName('disallowStatus')[0].checked ? 'on' : '';
+params.disallowService = document.getElementsByName('disallowService')[0].checked ? 'on' : '';
+if (isAdminRoute) {
+    params.disallowUser = document.getElementsByName('disallowUser')[0].checked ? 'on' : '';
+}
 jobsTable.init(params);
 
 const jobStatusLinks = new JobsStatusChangeLinks();

diff --git a/public/js/workflow-ui/jobs/jobs-table.js b/public/js/workflow-ui/jobs/jobs-table.js
@@ -190,8 +190,10 @@ async function loadRows(params) {
   let tableUrl = './workflow-ui/jobs';
   tableUrl += `?tableFilter=${encodeURIComponent(params.tableFilter)}`
   + `&disallowStatus=${params.disallowStatus}`
-  + `&disallowService=${params.disallowService}`
-  + `&disallowUser=${params.disallowUser}`;
+  + `&disallowService=${params.disallowService}`;
+  if (params.disallowUser) {
+    tableUrl += `&disallowUser=${params.disallowUser}`;
+  }
   const res = await fetch(tableUrl, {
     method: 'POST',
     headers: {