Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

"Global Configurations" defined in workflow XML are being lost during Import workflow (or) during "Reset workflow" #2856

Merged
merged 2 commits into from Mar 13, 2019
Merged

"Global Configurations" defined in workflow XML are being lost during Import workflow (or) during "Reset workflow" #2856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a2ea5b
wfm spark name node appending
venkatasairamlanka Aug 16, 2018
3da0487
Global Configurations defined in workflow XML are being lost during I…
venkatasairamlanka Mar 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions contrib/views/wfmanager/src/main/resources/ui/app/components/spark-action.js
View file
Open in desktop
Expand Up @@ -54,6 +54,7 @@ export default Ember.Component.extend(Validations,{
this.set('isJar', this.get('actionModel.jar') && this.get('actionModel.jar').endsWith('.jar'));
this.sendAction('register','sparkAction', this);
}.on('init'),
appendNameNode: false,
initialize : function(){
this.on('fileSelected',function(fileName){
this.set(this.get('filePathModel'), fileName);
Expand Down Expand Up @@ -105,6 +106,20 @@ export default Ember.Component.extend(Validations,{
this.$('#collapseOne').collapse('show');
}
}.on('didUpdate'),
validateJarPathAndAppend() {
let nameNode = this.get('actionModel.nameNode'), jar = this.get('actionModel.jar');
if(!jar) {
return;
}
this.toggleProperty('appendNameNode');
if(!jar.startsWith('${nameNode}') && this.get('appendNameNode')) {
this.set('actionModel.jar', `${nameNode}${jar}`);
} else if(jar.startsWith('${nameNode}') && this.get('appendNameNode')) {
this.set('actionModel.jar', `${jar}`);
} else {
this.set('actionModel.jar', jar.replace('${nameNode}', ''));
}
},
actions : {
openFileBrowser(model, context){
if(undefined === context){
Expand All @@ -116,6 +131,9 @@ export default Ember.Component.extend(Validations,{
register (name, context){
this.sendAction('register',name , context);
},
appendNamenode() {
this.validateJarPathAndAppend();
},
onMasterChange (elt){
var value = this.$(elt).val();
if(value !== 'other'){
Expand Down
9 changes: 9 additions & 0 deletions contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-importer.js
View file
Open in desktop
Expand Up @@ -63,6 +63,15 @@ var WorkflowImporter= Ember.Object.extend({
var nodeMap=this.setupNodeMap(workflowAppJson,workflow,Ember.$(xmlDoc));
this.setupTransitions(workflowAppJson,nodeMap);
workflow.set("startNode",nodeMap.get("start").node);
let globalProperties = workflowJson["workflow-app"].global.configuration.property;
if(workflowJson["workflow-app"].global) {
if(Ember.isArray(globalProperties)) {
workflow.set("globalSetting", workflowJson["workflow-app"].global);
} else {
workflow.set("globalSetting", {configuration : { property:[globalProperties] }} );
}
}

this.populateKillNodes(workflow,nodeMap);
return {workflow: workflow, errors: errors};
},
Expand Down
3 changes: 3 additions & 0 deletions contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
View file
Open in desktop
Expand Up @@ -1824,4 +1824,7 @@ input:invalid {
.note-info {
position: relative;
top: 10px;
}
.spark-namenode {
top: 15px;
}
7 changes: 7 additions & 0 deletions contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
View file
Open in desktop
Expand Up @@ -48,6 +48,13 @@
</div>
</div>
{{/if}}
<div class="form-group">
<label for="inputEmail" class="control-label col-xs-2">Append master<span class="requiredField">&nbsp;*</span></label>
<div class="col-xs-2 spark-namenode">
<input type="checkbox" name="master" checked={{appendNameNode}} value="other" onchange={{action "appendNamenode" value="target"}}>
</div>
</div>

<div class="form-group">
<label for="inputEmail" class="control-label col-xs-2">Runs On<span class="requiredField">&nbsp;*</span></label>
{{#each mastersList as |master|}}
Expand Down