diff --git a/ui/js/models/job.js b/ui/js/models/job.js index 513e3713f..99698b181 100644 --- a/ui/js/models/job.js +++ b/ui/js/models/job.js @@ -11,18 +11,6 @@ treeherder.factory('ThJobModel', [ angular.extend(this, data); }; - ThJobModel.prototype.running_time_remaining = function () { - var timestampNow = new Date().getTime()/1000; - var current_duration = timestampNow - parseInt(this.start_timestamp); - return Math.round((parseInt(this.running_eta) - current_duration) / 60); - }; - - ThJobModel.prototype.get_average_duration = function () { - return Math.round( - parseInt(this.running_eta) /60 - ); - }; - ThJobModel.prototype.get_title = function () { // we want to join the group and type information together // so we can search for it as one token (useful when diff --git a/ui/plugins/controller.js b/ui/plugins/controller.js index b90006a83..c8dab1983 100644 --- a/ui/plugins/controller.js +++ b/ui/plugins/controller.js @@ -141,11 +141,6 @@ treeherder.controller('PluginCtrl', [ //the first result comes from the job promise $scope.job = results[0]; - if ($scope.job.state === 'running') { - $scope.eta = $scope.job.running_time_remaining(); - $scope.eta_abs = Math.abs($scope.eta); - } - $scope.average_duration = $scope.job.get_average_duration(); $scope.resultsetId = ThResultSetStore.getSelectedJob($scope.repoName).job.result_set_id; $scope.jobRevision = ThResultSetStore.getResultSet($scope.repoName, $scope.resultsetId).revision; diff --git a/ui/plugins/job_details_pane.jsx b/ui/plugins/job_details_pane.jsx index 060deb330..28e5d6a40 100644 --- a/ui/plugins/job_details_pane.jsx +++ b/ui/plugins/job_details_pane.jsx @@ -49,14 +49,6 @@ const JobStatusPane = props => ( {props.job.state} - {props.job.state === 'running' &&
- {props.eta > 0 && Time remaining: ~{props.eta} minutes} - {props.eta < 0 && {Math.abs(props.eta)} mins overdue, typically takes ~{props.averageDuration} mins} - {props.eta === 0 && Due any minute now, typically takes ~{props.averageDuration} mins} -
} - {props.job.state === 'pending' &&
- Typically takes ~{props.averageDuration} mins once started -
} ); @@ -215,8 +207,7 @@ class JobDetailsPane extends React.Component { classificationTypes={this.props.classificationTypes} repoName={this.props.repoName} />} - +