Repository: ambari Updated Branches: refs/heads/trunk 985dafff5 -> abcd0637c
AMBARI-19752. Hive View 2.0 execute button needs some feedback (pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/abcd0637 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/abcd0637 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/abcd0637 Branch: refs/heads/trunk Commit: abcd0637c6f3328d0a6345e0573c30615cdcde83 Parents: 985daff Author: pallavkul <pallav....@gmail.com> Authored: Mon Jan 30 14:27:44 2017 +0530 Committer: pallavkul <pallav....@gmail.com> Committed: Mon Jan 30 14:29:15 2017 +0530 ---------------------------------------------------------------------- contrib/views/hive20/src/main/resources/ui/app/services/jobs.js | 4 ---- contrib/views/hive20/src/main/resources/ui/app/styles/app.scss | 4 ++++ .../hive20/src/main/resources/ui/app/templates/queries/query.hbs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/abcd0637/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js b/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js index ff54152..5db22d0 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js +++ b/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js @@ -27,16 +27,12 @@ export default Ember.Service.extend({ }, waitForJobToComplete(jobId, after, fetchDummyResult = true) { - console.log() return new Ember.RSVP.Promise((resolve, reject) => { Ember.run.later(() => { this.get('store').findRecord('job', jobId, { reload: true }) .then((job) => { let status = job.get('status').toLowerCase(); if (status === 'succeeded') { - if (fetchDummyResult) { - this._fetchDummyResult(jobId); - } resolve(status); } else if (status === 'error') { reject(status) http://git-wip-us.apache.org/repos/asf/ambari/blob/abcd0637/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss index e178222..17abb65 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss +++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss @@ -41,6 +41,10 @@ height: 100%; } +.fa-1-5{ + font-size: 1.5em; +} + .fa-2 { font-size: 2em; } http://git-wip-us.apache.org/repos/asf/ambari/blob/abcd0637/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs index 9e9e542..7f91d6c 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs +++ b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs @@ -31,7 +31,7 @@ <button class="btn btn-success" {{action "executeQuery" }}>{{fa-icon "check"}} Execute</button> <button class="btn btn-default" {{action "openWorksheetModal" }}>{{fa-icon "save"}} Save As</button> {{#if isQueryRunning}} - <img src="http://www.bba-reman.com/images/fbloader.gif" height="22" width="32" /> + {{fa-icon "spinner fa-1-5" spin=true}} {{/if}} </div> </div>