Repository: ambari Updated Branches: refs/heads/branch-2.5 a444517be -> f19a8e19a
AMBARI-19440. Need ability to upload and download action asset from HDFS (Madhan Mohan Reddy via gauravn7) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f19a8e19 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f19a8e19 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f19a8e19 Branch: refs/heads/branch-2.5 Commit: f19a8e19a34475a22b9f9bac051c451467ce7cc8 Parents: a444517 Author: Gaurav Nagar <[email protected]> Authored: Wed Jan 11 16:24:00 2017 +0530 Committer: Gaurav Nagar <[email protected]> Committed: Wed Jan 11 16:24:00 2017 +0530 ---------------------------------------------------------------------- .../ui/app/domain/cytoscape-flow-renderer.js | 7 +++---- .../src/main/resources/ui/app/styles/app.less | 3 +++ .../ui/app/templates/components/flow-designer.hbs | 14 +++++++------- .../ui/app/templates/components/workflow-actions.hbs | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f19a8e19/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js index d1150c3..96426ce 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/cytoscape-flow-renderer.js @@ -197,10 +197,9 @@ var CytoscapeRenderer= Ember.Object.extend({ this.get("context").$(".overlay-settings-icon").show(); } if (node.data().type === 'action') { - this.get("context").$(".overlay-copy-icon").show(); - this.get("context").$(".overlay-cut-icon").show(); - this.get("context").$(".overlay-hdfs-import-icon").show(); - this.get("context").$(".overlay-hdfs-export-icon").show(); + this.get("context").$(".overlay-copy-icon, .overlay-cut-icon").show(); + this.get("context").$(".overlay-hdfs-asset-import-icon, .overlay-hdfs-asset-export-icon").show(); + this.get("context").$(".overlay-asset-import-icon, .overlay-asset-export-icon").show(); if(this.get('context').get('clipboard')){ this.get("context").$(".overlay-paste-icon").show(); } http://git-wip-us.apache.org/repos/asf/ambari/blob/f19a8e19/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 92955d7..0c1e4ed 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 @@ -1609,3 +1609,6 @@ input:invalid { #draftsNum { padding-left:40%; } +.margin3{ + margin: 3px; +} http://git-wip-us.apache.org/repos/asf/ambari/blob/f19a8e19/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs index 42da448..01356b2 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs @@ -284,17 +284,17 @@ {{/file-picker}} </div> </span> - <span class="hide" title="Import action" {{action "showActionSettingsFileBrowser"}}> + <span class="overlay-asset-import-icon" title="Import Asset" {{action "showAssetList" true}}> <i class="fa fa-download"></i> </span> - <span class="overlay-hdfs-import-icon" title="Import Asset" {{action "showAssetList" true}}> - <i class="fa fa-download"></i> - </span> - <span class="hide" title="Export action" {{action "showExportActionNodeFileBrowser"}}> + <span class="overlay-asset-export-icon" title="Publish Asset" {{action "showAssetConfig" true}}> <i class="fa fa-upload"></i> </span> - <span class="overlay-hdfs-export-icon" title="Publish Asset" {{action "showAssetConfig" true}}> - <i class="fa fa-share-square-o"></i> + <span class="overlay-hdfs-asset-import-icon" title="Import asset from HDFS" {{action "showActionSettingsFileBrowser"}}> + <i class="fa fa-cloud-download"></i> + </span> + <span class="overlay-hdfs-asset-export-icon" title="Publish Asset to HDFS" {{action "showExportActionNodeFileBrowser"}}> + <i class="fa fa-cloud-upload"></i> </span> </div> {{decision-add-branch node=node registerAddBranchAction="registerAddBranchAction" addDecisionBranch="addDecisionBranch" workflow=workflow}} http://git-wip-us.apache.org/repos/asf/ambari/blob/f19a8e19/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs index be8afd4..6d672b4 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-actions.hbs @@ -35,8 +35,8 @@ </span> </div> {{/if}} - <div {{action 'showImportActionNodeFileBrowser'}} class="btn btn-default hide"> <i class="fa fa-download"></i> <span class="font10px">Import action</span></div> - <div {{action 'showAssetNodeList'}} class="btn btn-default"> <i class="fa fa-download"></i> <span class="font10px">Import asset</span></div> + <div {{action 'showAssetNodeList'}} class="btn btn-default margin3"> <i class="fa fa-download"></i> <span class="font10px">Import asset</span></div> + <div {{action 'showImportActionNodeFileBrowser'}} class="btn btn-default margin3"> <i class="fa fa-cloud-download"></i> <span class="font10px">Import asset from HDFS</span></div> <div class="clearfix"></div> <ul class="actions_list_left actionNodes"> <li {{action 'addAction' 'hive'}} class="dr_action enabled" data-name="Hive" data-type="hive"> <i class="fa fa-server"></i> Hive </li>
