Merge pull request #1749 from loganhz/fix

Fix

app/container/route.js

@@ -9,9 +9,6 @@ export default Route.extend({
         instance: get(container, 'containers.firstObject'),
         container: container,
       };
-      if (container.serviceId) {
-        out.service = get(this, 'store').getById('service', container.serviceId);
-      }
       return out;
     });
   },

app/container/template.hbs

@@ -3,9 +3,6 @@
     <h1 class="vertical-middle">
       {{t 'containerPage.header' name=model.container.displayName}}
     </h1>
-    <div class="vertical-middle" style="height: 30px;">
-      {{info-multi-stats model=model.container largeTargetId="largeStats"}}
-    </div>
   </div>
   <div class="right-buttons">
     {{badge-state model=model.container}}
@@ -20,15 +17,17 @@
   {{banner-message color='bg-secondary mb-0 mt-10' message=(linkify model.container.description)}}
 {{/if}}
 
+{{#if model.container.showTransitioningMessage}}
+  <div class="{{model.container.stateColor}}"><p>{{model.container.transitioningMessage}}</p></div>
+{{/if}}
+
 <section>
-  <div class="banner bg-info basics">
-    <div class="inline-block">
-      <label class="acc-label p-0">{{t 'generic.image'}}:</label>
-      {{#copy-inline clipboardText=model.container.image}}
-        {{model.container.image}}
-      {{/copy-inline}}
+  <div class="row banner bg-info basics">
+    <div class="vertical-middle">
+        <label class="acc-label vertical-middle p-0">{{t 'generic.image'}}:</label>
+        {{model.instance.image}} {{copy-to-clipboard clipboardText=model.instance.image size="small"}}
       </div>
-    <div class="inline-block">
+    <div class="vertical-middle">
       <label class="acc-label p-0">{{t 'generic.ipAddress'}}:</label>
       {{#if model.container.displayIp}}
         {{#copy-inline clipboardText=model.container.displayIp}}
@@ -38,39 +37,9 @@
         {{t 'generic.none'}}
       {{/if}}
     </div>
-    {{#if model.container.serviceId}}
-      <div class="inline-block">
-        <label class="acc-label p-0">{{t 'generic.service'}}:</label>
-        {{#link-to "workload" projects.current.id model.container.serviceId}}{{model.service.name}}{{/link-to}}
-      </div>
-    {{/if}}
-    {{#if model.container.stack}}
-      <div class="inline-block">
-        <label class="acc-label p-0">{{t 'generic.stack'}}:</label>
-        {{#link-to "stack" projects.current.id model.container.stack.id}}{{model.container.stack.displayName}}{{/link-to}}
-      </div>
-    {{/if}}
-    {{#if model.container.primaryHost}}
-      <div class="inline-block">
-        <label class="acc-label p-0">{{t 'generic.host'}}:</label>
-        {{#link-to "host" model.container.primaryHost.id}}{{model.container.primaryHost.displayName}}{{/link-to}}
-      </div>
-    {{/if}}
-    {{#if model.container.displayExternalId}}
-      <div class="inline-block">
-        <label class="acc-label p-0">{{t 'generic.dockerId'}}:</label>
-        {{#copy-inline clipboardText=model.container.externalId}}
-          {{model.container.displayExternalId}}
-        {{/copy-inline}}
-      </div>
-    {{/if}}
   </div>
 </section>
 
-{{#if model.container.showTransitioningMessage}}
-  <div class="{{model.container.stateColor}}"><p>{{model.container.transitioningMessage}}</p></div>
-{{/if}}
-
 <section>
   {{#accordion-list as |al expandFn|}}
 
@@ -94,12 +63,39 @@
     </div>
 
     <div class="mt-20">
-      {{form-healthcheck
-        healthCheck=model.container.readinessProbe
-        editing=false
+      {{#accordion-list-item
+        title=(t 'formHealthCheck.title')
+        detail=(t 'formHealthCheck.detail')
         expandAll=al.expandAll
-        expandFn=expandFn
+        expand=(action expandFn)
       }}
+        <div class="row">
+          <div class="col span-6 mt-0 mb-0">
+            <label class="acc-label">{{t 'formHealthCheck.readiness'}}</label>
+          </div>
+          <div class="col span-6 mt-0 mb-0">
+            {{#if model.instance.livenessProbe}}
+              <label class="acc-label">{{t 'formHealthCheck.liveness'}}</label>
+            {{/if}}
+          </div>
+        </div>
+        <div class="row">
+          <div class="col {{if model.instance.livenessProbe 'span-6' 'span-12'}}">
+            {{form-healthcheck
+              initialCheck=model.instance.readinessProbe
+              editing=false
+            }}
+          </div>
+          {{#if model.instance.livenessProbe}}
+            <div class="col span-6">
+              {{form-healthcheck
+                initialCheck=model.instance.livenessProbe
+                editing=false
+              }}
+            </div>
+          {{/if}}
+        </div>
+      {{/accordion-list-item}}
     </div>
 
     <div class="mt-20">
@@ -175,15 +171,6 @@
       }}
     </div>
 
-    <div class="mt-20">
-      {{container/form-secrets
-        instance=model.container
-        editing=false
-        expandAll=al.expandAll
-        expandFn=expandFn
-      }}
-    </div>
-
     <div class="mt-20">
       {{#accordion-list-item
           title=(t 'containerPage.volumesTab.header')

app/workload/template.hbs

@@ -30,16 +30,16 @@
   <div class="row banner bg-info basics">
     {{#if service.externalIpAddresses}}
       <div class="vertical-middle">
-        <label class="text-muted ml-15">{{t 'servicePage.external.externalIp' count=service.externalIpAddresses.length}}</label>
+        <label class="acc-label vertical-middle p-0">{{t 'servicePage.external.externalIp' count=service.externalIpAddresses.length}}</label>
         {{join-array service.externalIpAddresses}}
       </div>
     {{else if service.hostname}}
       <div class="vertical-middle">
-        <label class="text-muted">{{t 'servicePage.external.externalHostname'}} </label> {{service.hostname}}
+        <label class="acc-label vertical-middle p-0">{{t 'servicePage.external.externalHostname'}} </label> {{service.hostname}}
       </div>
     {{else if service.selector}}
       <div class="vertical-middle">
-        <label class="text-muted">{{t 'servicePage.selector.label'}} </label> {{service.selector}}
+        <label class="acc-label vertical-middle p-0">{{t 'servicePage.selector.label'}} </label> {{service.selector}}
       </div>
     {{/if}}
 
@@ -58,7 +58,7 @@
         </span>
         <div class="btn-group btn-group-xs p-0">
           <button class="btn btn-xs bg-primary" {{action "scaleDown" target=service}} disabled={{not service.canScaleDown}}><i class="icon icon-minus icon-fw"/></button>
-          <button style="margin-left: -5px;" class="btn btn-xs bg-primary" {{action "scaleUp" target=service}} disabled={{not service.canScaleUp}}><i class="icon icon-plus icon-fw"/></button>
+          <button style="margin-left: -1px;" class="btn btn-xs bg-primary" {{action "scaleUp" target=service}} disabled={{not service.canScaleUp}}><i class="icon icon-plus icon-fw"/></button>
         </div>
       </div>
     {{/if}}
@@ -208,16 +208,6 @@
       expandFn=expandFn
     }}
 
-    {{#if service.canHaveSecrets}}
-      {{container/form-secrets
-        instance=activeLaunchConfig
-        editing=false
-        expandAll=al.expandAll
-        expandFn=expandFn
-        classNames="accordion"
-      }}
-    {{/if}}
-
     {{#if service.canChangeSecurity}}
       {{container/form-security
         instance=activeLaunchConfig

lib/shared/addon/components/container/form-security/component.js

@@ -53,13 +53,13 @@ export default Component.extend({
   // 2) has CAP_SYS_ADMIN
   // ----------------------------------
   privilegedChanged: observer('instance.privileged', 'instance.capAdd.[]', function () {
-    if (get(this, 'instance.privileged') || get(this, 'instance.capAdd').indexOf('SYS_ADMIN') > -1) {
+    if (get(this, 'instance.privileged') || (get(this, 'instance.capAdd') && get(this, 'instance.capAdd').indexOf('SYS_ADMIN') > -1)) {
       set(this, 'instance.allowPrivilegeEscalation', true);
     }
   }),
 
   allowPrivilegeEscalationDisabled: computed('instance.privileged', 'instance.capAdd.[]', function () {
-    return get(this, 'instance.privileged') || get(this, 'instance.capAdd').indexOf('SYS_ADMIN') > -1;
+    return get(this, 'instance.privileged') || (get(this, 'instance.capAdd') && get(this, 'instance.capAdd').indexOf('SYS_ADMIN') > -1);
   }),
 
   // ----------------------------------

lib/shared/addon/components/container/form-volumes/template.hbs

@@ -3,8 +3,10 @@
   detail=(t 'formVolumes.detail' appName=settings.appName)
   status=status
   statusClass=statusClass
-  expand=(action expandFn)
+  expandAll=expandAll
   expandOnInit=expandOnInit
+  expand=(action expandFn)
+  everExpanded=true
 }}
   {{#if scope.currentProject.isWindows}}
     <div class="text-center p-20">Volume support is not currently available for Windows.</div>