Browse Source

HUE-2069 [jb] The new jobs in ACCEPTED state are not automatically appearing

Put the running and finished statuses as JS constant in utils.js
Enrico Berti 11 years ago
parent
commit
182f8dafb1

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/job.mako

@@ -470,7 +470,7 @@ $(document).ready(function () {
     }
     }
     $("#jobDuration").html('<span title="' + emptyStringIfNull(job.durationMs) + '">' + (job.isRetired ? '${_('N/A')}' : emptyStringIfNull(job.durationFormatted)) + '</span>');
     $("#jobDuration").html('<span title="' + emptyStringIfNull(job.durationMs) + '">' + (job.isRetired ? '${_('N/A')}' : emptyStringIfNull(job.durationFormatted)) + '</span>');
 
 
-    if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED', 'STARTED', 'FINISHING'].indexOf(job.status.toUpperCase()) == -1) {
+    if (Utils.RUNNING_ARRAY.indexOf(job.status.toUpperCase()) == -1) {
       window.clearInterval(_runningInterval);
       window.clearInterval(_runningInterval);
       removeFailedTasksFromRecent();
       removeFailedTasksFromRecent();
       $.jHueTitleUpdater.reset();
       $.jHueTitleUpdater.reset();

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/jobbrowser_components.mako

@@ -193,7 +193,7 @@
 
 
 <%def name="get_container_link(status, node_manager_http_address, container_id)">
 <%def name="get_container_link(status, node_manager_http_address, container_id)">
     ## As soon as the job finishes the container disappears
     ## As soon as the job finishes the container disappears
-    % if status.lower() in ('running', 'prep', 'accepted', 'finishing'):
+    % if status.lower() in ('running', 'accepted', 'ready', 'prep', 'waiting', 'suspended', 'prepsuspended', 'preppaused', 'paused', 'submitted', 'suspendedwitherror', 'pausedwitherror', 'finishing', 'started'):
         <a href="${ url('jobbrowser.views.container', node_manager_http_address=node_manager_http_address, containerid=container_id) }" class="task_tracker_link">${ container_id }</a>
         <a href="${ url('jobbrowser.views.container', node_manager_http_address=node_manager_http_address, containerid=container_id) }" class="task_tracker_link">${ container_id }</a>
     % else:
     % else:
         ${ container_id }
         ${ container_id }

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/jobs.mako

@@ -182,7 +182,7 @@ ${ components.menubar() }
         // Update updateableRows.
         // Update updateableRows.
         for(var i = 0; i < data.length; ++i) {
         for(var i = 0; i < data.length; ++i) {
           var job = data[i];
           var job = data[i];
-          if (['RUNNING', 'PREP', 'WAITING', 'SUSPENDED', 'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED', 'STARTED', 'FINISHING'].indexOf(job.status.toUpperCase()) > -1) {
+          if (Utils.RUNNING_ARRAY.indexOf(job.status.toUpperCase()) > -1) {
             updateableRows[job.shortId] = job;
             updateableRows[job.shortId] = job;
 
 
             var nNodes = jobTable.fnGetNodes();
             var nNodes = jobTable.fnGetNodes();

+ 10 - 5
apps/jobbrowser/static/js/utils.js

@@ -14,6 +14,14 @@
 // See the License for the specific language governing permissions and
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // limitations under the License.
 
 
+var Utils = {
+  SUCCEEDED_ARRAY: ['SUCCEEDED', 'OK', 'DONE'],
+  RUNNING_ARRAY: ['RUNNING', 'ACCEPTED', 'READY',
+    'PREP', 'WAITING', 'SUSPENDED',
+    'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED',
+    'SUBMITTED', 'SUSPENDEDWITHERROR', 'PAUSEDWITHERROR', 'FINISHING', 'STARTED']
+};
+
 function initLogsElement(element) {
 function initLogsElement(element) {
   element.data("logsAtEnd", true);
   element.data("logsAtEnd", true);
   element.scroll(function () {
   element.scroll(function () {
@@ -66,13 +74,10 @@ function getStatusClass(status, prefix) {
     prefix = "label-";
     prefix = "label-";
   }
   }
   var klass = "";
   var klass = "";
-  if (['SUCCEEDED', 'OK', 'DONE'].indexOf(status) > -1) {
+  if (Utils.SUCCEEDED_ARRAY.indexOf(status) > -1) {
     klass = prefix + "success";
     klass = prefix + "success";
   }
   }
-  else if (['RUNNING', 'ACCEPTED', 'READY',
-    'PREP', 'WAITING', 'SUSPENDED',
-    'PREPSUSPENDED', 'PREPPAUSED', 'PAUSED',
-    'SUBMITTED', 'SUSPENDEDWITHERROR', 'PAUSEDWITHERROR', 'FINISHING', 'STARTED'].indexOf(status) > -1) {
+  else if (Utils.RUNNING_ARRAY.indexOf(status) > -1) {
     klass = prefix + "warning";
     klass = prefix + "warning";
   }
   }
   else {
   else {