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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d1cd5736
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d1cd5736
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d1cd5736

Branch: refs/heads/HDFS-12996
Commit: d1cd573687fa3466a5ceb9a525141a8c3a8f686f
Parents: cc68395
Author: Sunil G <sun...@apache.org>
Authored: Fri Feb 23 16:50:02 2018 +0530
Committer: Sunil G <sun...@apache.org>
Committed: Fri Feb 23 16:50:02 2018 +0530

----------------------------------------------------------------------
 .../main/webapp/app/components/service-component-table.js |  2 +-
 .../src/main/webapp/app/models/yarn-servicedef.js         | 10 ++++++----
 .../app/templates/components/service-component-table.hbs  |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d1cd5736/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-component-table.js
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-component-table.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-component-table.js
index 5a9ae30..23c2cfb 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-component-table.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/service-component-table.js
@@ -52,5 +52,5 @@ export default Ember.Component.extend({
     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')
 });

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d1cd5736/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
index 0439fb4..19c74e1 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-servicedef.js
@@ -189,10 +189,12 @@ export default DS.Model.extend({
     json['number_of_containers'] = record.get('numOfContainers');
     json['launch_command'] = record.get('launchCommand');
     json['dependencies'] = [];
-    json['artifact'] = {
-      id: record.get('artifactId'),
-      type: record.get('artifactType')
-    };
+    if (!Ember.isEmpty(record.get('artifactId'))) {
+      json['artifact'] = {
+        id: record.get('artifactId'),
+        type: record.get('artifactType')
+      };
+    }
     json['resource'] = {
       cpus: record.get('cpus'),
       memory: record.get('memory')

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d1cd5736/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
index 8f3904d..9d519ae 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/components/service-component-table.hbs
@@ -90,7 +90,7 @@
           {{input type="number" min="0" class="form-control" 
value=currentComponent.numOfContainers}}
         </div>
         <div class="form-group">
-          <label class="required">Artifact Id</label>
+          <label>Artifact Id</label>
           {{input type="text" class="form-control" 
value=currentComponent.artifactId}}
         </div>
         <div class="form-group">


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to