You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/04/12 13:49:09 UTC
[24/35] ambari git commit: AMBARI-20740.Coordinator
Actions(workflows) are empty even when workflows are executed.(M Madhan Mohan
Reddy via padmapriyanitt)
AMBARI-20740.Coordinator Actions(workflows) are empty even when workflows are executed.(M Madhan Mohan Reddy via padmapriyanitt)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d297f5a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d297f5a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d297f5a
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 4d297f5aa013eb518a7eb70c71c02f202db2868b
Parents: 504e0b0
Author: padmapriyanitt <pa...@gmail.com>
Authored: Wed Apr 12 17:18:56 2017 +0530
Committer: padmapriyanitt <pa...@gmail.com>
Committed: Wed Apr 12 17:18:56 2017 +0530
----------------------------------------------------------------------
.../resources/ui/app/routes/design/jobtab.js | 2 +-
.../src/main/resources/ui/app/styles/app.less | 6 ++
.../templates/components/coord-job-details.hbs | 66 +++++++++++---------
3 files changed, 43 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4d297f5a/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/jobtab.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/jobtab.js b/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/jobtab.js
index 3fecbaa..9adf3ae 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/jobtab.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/routes/design/jobtab.js
@@ -37,7 +37,7 @@ export default Ember.Route.extend({
return deferred.promise;
},
model : function(params){
- return this.getJobInfo(Ember.ENV.API_URL+'/v2/job/'+params.id+'?show=info&timezone=GMT&offset=1').catch(function(){
+ return this.getJobInfo(Ember.ENV.API_URL+'/v2/job/'+params.id+'?show=info&timezone=GMT&offset=1&len='+1000).catch(function(){
return {error : "Remote API Failed"};
}).then(function(response){
if (typeof response === "string") {
http://git-wip-us.apache.org/repos/asf/ambari/blob/4d297f5a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
index 3c5e720..abb0637 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
@@ -1813,3 +1813,9 @@ input:invalid {
overflow-y: scroll;
margin-bottom: 10px;
}
+
+#coord-actions-list-body-conatiner {
+ max-height: 350px;
+ overflow-y: scroll;
+ margin-bottom: 10px;
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/4d297f5a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-job-details.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-job-details.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-job-details.hbs
index b3f1097..18a17d1 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-job-details.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-job-details.hbs
@@ -82,36 +82,42 @@
</div>
</div>
<div role="tabpanel" class="tab-pane" id="jobAction">
- <table id="action-list" class="table listing job-listing table-striped table-hover table-bordered">
- <thead>
- <tr>
- <th>Id</th>
- <th>Status</th>
- <th>External Id</th>
- <th>Error Code</th>
- <th>Created Time</th>
- <th>Nominal Time</th>
- <th>Last Modified Time</th>
- </tr>
- </thead>
- <tbody>
- {{#each model.actions as |actionInfo|}}
- <tr class="{{if (eq actionInfo model.actionDetails) "active"}}">
- {{#if actionInfo.externalId}}
- <td class="pointer action-link" {{action 'showWorkflow' actionInfo.externalId}}>{{actionInfo.id}}</td>
- {{else}}
- <td>{{actionInfo.id}}</td>
- {{/if}}
- <td>{{actionInfo.status}}</td>
- <td>{{actionInfo.externalId}}</td>
- <td>{{actionInfo.errorCode}}</td>
- <td>{{actionInfo.createdTime}}</td>
- <td>{{actionInfo.nominalTime}}</td>
- <td>{{actionInfo.lastModifiedTime}}</td>
- </tr>
- {{/each}}
- </tbody>
- </table>
+ <div id="actions-list-header-conatiner">
+ <table id="actions-list-header" class="table listing job-listing table-striped table-hover table-bordered">
+ <thead>
+ <tr>
+ <th class="col-xs-2">Id</th>
+ <th class="col-xs-1">Status</th>
+ <th class="col-xs-2">External Id</th>
+ <th class="col-xs-1">Error Code</th>
+ <th class="col-xs-2">Created Time</th>
+ <th class="col-xs-2">Nominal Time</th>
+ <th class="col-xs-2">Last Modified Time</th>
+ </tr>
+ </thead>
+ </table>
+ </div>
+ <div id="coord-actions-list-body-conatiner">
+ <table id="actions-list-body" class="table listing job-listing table-striped table-hover table-bordered">
+ <tbody>
+ {{#each model.actions as |actionInfo|}}
+ <tr class="{{if (eq actionInfo model.actionDetails) "active"}}">
+ {{#if actionInfo.externalId}}
+ <td class="pointer action-link col-xs-2" {{action 'showWorkflow' actionInfo.externalId}}>{{actionInfo.id}}</td>
+ {{else}}
+ <td class="col-xs-2">{{actionInfo.id}}</td>
+ {{/if}}
+ <td class="col-xs-1">{{actionInfo.status}}</td>
+ <td class="col-xs-2">{{actionInfo.externalId}}</td>
+ <td class="col-xs-1">{{actionInfo.errorCode}}</td>
+ <td class="col-xs-2">{{actionInfo.createdTime}}</td>
+ <td class="col-xs-2">{{actionInfo.nominalTime}}</td>
+ <td class="col-xs-2">{{actionInfo.lastModifiedTime}}</td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
+ </div>
</div>
<div role="tabpanel" class="tab-pane" id="jobDefinition">
<div class="panel panel-default">