瀏覽代碼

HUE-6857 [dataeng] Support latest job displaying API

Romain Rigaux 8 年之前
父節點
當前提交
d3e693be8a

+ 2 - 2
apps/jobbrowser/src/jobbrowser/apis/data_eng_api.py

@@ -110,9 +110,9 @@ class DataEngJobApi(Api):
     }
 
   def app(self, appid):
-    handle = DataEng(self.user).describe_jobs(job_ids=[appid])
+    handle = DataEng(self.user).describe_job(job_id=appid)
 
-    job = handle['jobs'][0]
+    job = handle['job']
 
     common = {
         'id': job['jobId'],

+ 5 - 1
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -829,7 +829,10 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
   ${ _('Duration') } <span data-bind="text: duration().toHHMMSS()"></span>
   ${ _('Submitted') } <span data-bind="text: submitted"></span>
 
-  <div data-bind="template: { name: 'render-properties${ SUFFIX }', data: properties['properties'] }"></div>
+  <br>
+
+  <span data-bind="text: ko.mapping.toJSON(properties['properties'])"></span>
+  ##<div data-bind="template: { name: 'render-properties${ SUFFIX }', data: properties['properties'] }"></div>
 </script>
 
 
@@ -1329,6 +1332,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
   <!-- /ko -->
 </script>
 
+
 <script type="text/html" id="render-page-counters${ SUFFIX }">
   <!-- ko hueSpinner: { spin: !$data.id, center: true, size: 'xlarge' } --><!-- /ko -->
 

+ 2 - 27
desktop/libs/notebook/src/notebook/connectors/dataeng.py

@@ -173,33 +173,8 @@ class DataEng():
 
     return _exec(args)
 
-  def describe_jobs(self, submitter_crns=None, page_size=None, starting_token=None, job_statuses=None, job_ids=None, job_types=None, creation_date_before=None,
-        creation_date_after=None, cluster_crn=None, order=None):
-    args = ['describe-jobs']
-
-    if creation_date_after is None:
-      creation_date_after = (datetime.today() - timedelta(days=7)).strftime(DATE_FORMAT)
-
-    if submitter_crns:
-      args.extend(['--submitter-crns', submitter_crns])
-    if page_size is not None:
-      args.extend(['--page-size', str(page_size)])
-    if starting_token:
-      args.extend(['--starting-token', starting_token])
-    if job_statuses:
-      args.extend(['--job-statuses', job_statuses])
-    if job_ids:
-      args.extend(['--job-ids'] + job_ids)
-    if job_types:
-      args.extend(['--job-types', job_types])
-    if creation_date_before:
-      args.extend(['--creation-date-before', creation_date_before])
-    if creation_date_after:
-      args.extend(['--creation-date-after', creation_date_after])
-    if cluster_crn:
-      args.extend(['--cluster-crn', cluster_crn])
-    if order:
-      args.extend(['--order', order])
+  def describe_job(self, job_id):
+    args = ['describe-job', '--job-id', job_id]
 
     return _exec(args)