From ae3b66ca8dc696155b02532d535dc55fee2e3994 Mon Sep 17 00:00:00 2001
From: Vincent Fiduccia <vincent@rancher.com>
Date: Mon, 19 Oct 2015 14:05:23 -0700
Subject: [PATCH] Sidekick fixes

---
 app/components/new-container/component.js |  9 ++-
 app/components/new-container/template.hbs | 76 +++++++++++------------
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/app/components/new-container/component.js b/app/components/new-container/component.js
index dcc01972a..84b3a1947 100644
--- a/app/components/new-container/component.js
+++ b/app/components/new-container/component.js
@@ -43,6 +43,9 @@ export default Ember.Component.extend(NewOrEdit, SelectTab, {
       var ary = this.get('service.secondaryLaunchConfigs');
       ary.pushObject(this.get('store').createRecord({
         type: 'secondaryLaunchConfig',
+        tty: true,
+        stdinOpen: true,
+        restartPolicy: {name: 'always'},
       }));
       this.send('selectLaunchConfig', ary.get('length')-1);
     },
@@ -139,7 +142,11 @@ export default Ember.Component.extend(NewOrEdit, SelectTab, {
       (this.get('scaleLabels')||[]).forEach((row) => { out[row.key] = row.value; });
       (this.get('schedulingLabels')||[]).forEach((row) => { out[row.key] = row.value; });
 
-      this.set('launchConfig.labels', out);
+      var config = this.get('launchConfig');
+      if ( config )
+      {
+        this.set('launchConfig.labels', out);
+      }
     }
   ),
 
diff --git a/app/components/new-container/template.hbs b/app/components/new-container/template.hbs
index 1d36550ab..09b2fa583 100644
--- a/app/components/new-container/template.hbs
+++ b/app/components/new-container/template.hbs
@@ -1,56 +1,53 @@
-<section class="horizontal-form container-fluid">
-  {{#unless isSidekick}}
+{{#unless isSidekick}}
+  <section class="horizontal-form container-fluid">
     <h2>Add
       {{#if isService}}
         Service
         {{#if hasSidekicks}}
           +
-          {{service.secondaryLaunchConfigs.length}} Sidekick{{if (not-eq service.secondaryLaunchConfigs.length 1) 's'}}
+          {{service.secondaryLaunchConfigs.length}} Sidekick Service{{if (not-eq service.secondaryLaunchConfigs.length 1) 's'}}
         {{/if}}
       {{else}}
         Container
       {{/if}}
     </h2>
     {{top-errors errors=errors}}
-  {{/unless}}
 
-  {{#if (and isService (not isSidekick))}}
-    {{form-scale
-      initialLabels=launchConfig.labels
-      initialScale=service.scale
-      isGlobal=isGlobal
-      errors=scaleErrors
-      setLabels=(action 'setLabels' 'scale')
-      setGlobal=(action 'setGlobal')
-      setScale=(action  'setScale')
-    }}
+    {{#if (and isService (not isSidekick))}}
+      {{form-scale
+        initialLabels=launchConfig.labels
+        initialScale=service.scale
+        isGlobal=isGlobal
+        errors=scaleErrors
+        setLabels=(action 'setLabels' 'scale')
+        setGlobal=(action 'setGlobal')
+        setScale=(action  'setScale')
+      }}
 
-    <div class="row form-group">
-      <div class="col-sm-12 col-md-2 form-label r-mt5">
-        <label>Sidekicks</label>
-      </div>
+      {{form-divider}}
 
-      <div class="col-sm-12 col-md-8">
-        {{#if hasSidekicks}}
-          <nav>
-            <ul class="pagination pagination-sm r-m0">
-              <li class="{{if (eq launchConfigIndex -1) 'active'}}"><a href="#" {{action "selectLaunchConfig" -1}}>{{default-str service.name default="(Primary Service)"}}</a></li>
-              {{#each service.secondaryLaunchConfigs as |slc index|}}
-                <li class="{{if (eq launchConfigIndex index) 'active'}}"><a href="#" {{action "selectLaunchConfig" index}}>{{default-str slc.name (concat-str '(Sidekick #' (one-louder index) ')')}}</a></li>
-              {{/each}}
-              <li><a {{action "addSidekick"}} tooltip="Add Sidekick"><i class="icon icon-plus"/></a></li>
-            </ul>
-          </nav>
-        {{else}}
-          <button class="btn-circle-plus btn-circle-text" style="margin-right: 20px;" {{action "addSidekick"}}>Add Sidekick</button>
-        {{/if}}
-      </div>
-    </div>
+      {{#if hasSidekicks}}
+        <div class="row">
+          <div class="col-sm-12 col-md-2 form-label r-mt5">
+            <label>Service</label>
+          </div>
 
-    {{form-divider}}
-
-  {{/if}}
-</section>
+          <div class="col-sm-12 col-md-8">
+            <nav>
+              <ul class="pagination pagination-sm r-m0">
+                <li class="{{if (eq launchConfigIndex -1) 'active'}}"><a href="#" {{action "selectLaunchConfig" -1}}>{{default-str service.name default="(Primary Service)"}}</a></li>
+                {{#each service.secondaryLaunchConfigs as |slc index|}}
+                  <li class="{{if (eq launchConfigIndex index) 'active'}}"><a href="#" {{action "selectLaunchConfig" index}}>{{default-str slc.name (concat-str '(Sidekick #' (one-louder index) ')')}}</a></li>
+                {{/each}}
+                <li><a {{action "addSidekick"}} tooltip="Add Sidekick"><i class="icon icon-plus"/></a></li>
+              </ul>
+            </nav>
+          </div>
+        </div>
+      {{/if}}
+    {{/if}}
+  </section>
+{{/unless}}
 
 <div data-launchindex="-1">
   <section class="horizontal-form container-fluid">
@@ -165,6 +162,9 @@
 
 {{#unless isSidekick}}
   {{#save-cancel save="save" cancel="cancel"}}
+    {{#if isService}}
+      <button class="btn btn-default" {{action "addSidekick"}}>Add a Sidekick</button>
+    {{/if}}
     {{#if (not-eq launchConfigIndex -1)}}
       <button class="btn btn-default" {{action "removeSidekick"}}>Remove this Sidekick</button>
     {{/if}}