big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-7949. [UI2] ArtifactsId should not be a compulsory field for new service. Contributed by Yesha Vora.

Browse Source
This commit is contained in:
Sunil G 2018-02-23 16:50:02 +05:30
parent cc683952d2
commit d1cd573687
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-component-table.js
View File

@ -52,5 +52,5 @@ export default Ember.Component.extend({
return !Ember.isNone(item); return !Ember.isNone(item);
}, },
isValidCurrentComponent: Ember.computed.and('currentComponent', 'currentComponent.name', 'currentComponent.cpus', 'currentComponent.memory', 'currentComponent.numOfContainers', 'currentComponent.artifactId', 'currentComponent.launchCommand') isValidCurrentComponent: Ember.computed.and('currentComponent', 'currentComponent.name', 'currentComponent.cpus', 'currentComponent.memory', 'currentComponent.numOfContainers', 'currentComponent.launchCommand')
}); });

10
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
View File

@ -189,10 +189,12 @@ export default DS.Model.extend({
json['number_of_containers'] = record.get('numOfContainers'); json['number_of_containers'] = record.get('numOfContainers');
json['launch_command'] = record.get('launchCommand'); json['launch_command'] = record.get('launchCommand');
json['dependencies'] = []; json['dependencies'] = [];
json['artifact'] = { if (!Ember.isEmpty(record.get('artifactId'))) {
id: record.get('artifactId'), json['artifact'] = {
type: record.get('artifactType') id: record.get('artifactId'),
}; type: record.get('artifactType')
};
}
json['resource'] = { json['resource'] = {
cpus: record.get('cpus'), cpus: record.get('cpus'),
memory: record.get('memory') memory: record.get('memory')

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
View File

@ -90,7 +90,7 @@
{{input type="number" min="0" class="form-control" value=currentComponent.numOfContainers}} {{input type="number" min="0" class="form-control" value=currentComponent.numOfContainers}}
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="required">Artifact Id</label> <label>Artifact Id</label>
{{input type="text" class="form-control" value=currentComponent.artifactId}} {{input type="text" class="form-control" value=currentComponent.artifactId}}
</div> </div>
<div class="form-group"> <div class="form-group">