Merge pull request #869 from vincent99/master

Bugs
2016-10-20 10:19:47 -07:00 · 2016-10-20 10:19:47 -07:00 · b76302b3f3
parent e6966f35ff fd0dfc6e37
commit b76302b3f3
19 changed files with 38 additions and 26 deletions
--- a/app/components/container-logs/component.js
+++ b/app/components/container-logs/component.js
@ -20,7 +20,7 @@ export default Ember.Component.extend(ThrottledResize, {

  logHeight: 300,

-  onlyCombinedLog: Ember.computed.alias('context.instance.tty'),
+  onlyCombinedLog: Ember.computed.alias('instance.tty'),
  which: 'combined',
  isCombined: Ember.computed.equal('which','combined'),
  isStdOut: Ember.computed.equal('which','stdout'),
--- a/app/components/container-row/component.js
+++ b/app/components/container-row/component.js
@ -1,4 +1,5 @@
 import Ember from 'ember';
+import C from 'ui/utils/constants';

 export default Ember.Component.extend({
  projects: Ember.inject.service(),
@ -13,6 +14,10 @@ export default Ember.Component.extend({

  tagName: 'TR',

+  statsAvailable: function() {
+    return C.ACTIVEISH_STATES.indexOf(this.get('model.state')) >= 0 && this.get('model.healthState') !== 'started-once';
+  }.property('model.{state,healthState}'),
+
  detailRoute: function() {
    if ( this.get('model.isVm') ) {
      return 'virtualmachine';
--- a/app/components/container-row/template.hbs
+++ b/app/components/container-row/template.hbs
@ -24,7 +24,7 @@
 </td>
 {{#if showStats}}
  <td data-title="{{t 'containersPage.table.stats'}}:" class="spark-td">
-    {{#if model.cpuSpark}}
+    {{#if (and statsAvailable model.cpuSpark)}}
      {{spark-line
        data=model.cpuSpark
        width=60 height=25 max=cpuMax
@ -51,6 +51,8 @@
        prefix="containersPage.table.sparkPrefixStorage"
        formatter="kbps"
        type="storage"}}
+    {{else}}
+      <span class="text-muted">{{t 'generic.na'}}</span>
    {{/if}}
  </td>
 {{else}}
--- a/app/components/copy-ip/template.hbs
+++ b/app/components/copy-ip/template.hbs
@ -1,4 +1,4 @@
-{{format-ip displayIp noIp=noIp}}
+{{format-ip ip noIp=noIp}}
 {{#if ip}}
  {{copy-to-clipboard clipboardText=ip size='small'}}
 {{/if}}
--- a/app/components/edit-aliasservice/component.js
+++ b/app/components/edit-aliasservice/component.js
@ -3,7 +3,7 @@ import ModalBase from 'lacsso/components/modal-base';
 import NewServiceAlias from 'ui/mixins/new-service-alias';

 export default ModalBase.extend(NewServiceAlias, {
-  classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
+  classNames: ['lacsso', 'modal-container', 'full-width-modal'],
  originalModel  : Ember.computed.alias('modalService.modalOpts'),
  allServicesService: Ember.inject.service('all-services'),
  editing: true,
--- a/app/components/edit-balancerservice/component.js
+++ b/app/components/edit-balancerservice/component.js
@ -3,7 +3,7 @@ import NewBalancer from 'ui/mixins/new-balancer';
 import ModalBase from 'lacsso/components/modal-base';

 export default ModalBase.extend(NewBalancer, {
-  classNames         : ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
+  classNames         : ['lacsso', 'modal-container', 'full-width-modal'],
  originalModel      : Ember.computed.alias('modalService.modalOpts'),

  actions: {
--- a/app/components/edit-externalservice/component.js
+++ b/app/components/edit-externalservice/component.js
@ -3,7 +3,7 @@ import Ember from 'ember';
 import ModalBase from 'lacsso/components/modal-base';

 export default ModalBase.extend(NewOrEdit, {
-  classNames         : ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
+  classNames         : ['lacsso', 'modal-container', 'full-width-modal'],
  originalModel      : Ember.computed.alias('modalService.modalOpts'),
  existing: Ember.computed.alias('originalModel'),
  editing: true,
--- a/app/components/form-command/component.js
+++ b/app/components/form-command/component.js
@ -66,12 +66,12 @@ export default Ember.Component.extend(ManageLabels, {
  },

  terminalDidChange: function() {
-    var val = this.get('terminal');
+    var val = this.get('terminal.type');
    var stdinOpen = ( val === 'interactive' || val === 'both' );
-    var tty = (val.type === 'terminal' || val.type === 'both');
+    var tty = (val === 'terminal' || val === 'both');
    this.set('instance.tty', tty);
    this.set('instance.stdinOpen', stdinOpen);
-  }.observes('terminal'),
+  }.observes('terminal.type'),

  // ----------------------------------
  // Start Once
--- a/app/components/form-command/template.hbs
+++ b/app/components/form-command/template.hbs
@ -70,8 +70,8 @@
    </div>
  {{/input-or-display}}
 </div>
-<div class="row form-group">
-  {{#if editing}}
+{{#if editing}}
+  <div class="row form-group">
    <div class="hidden-xs hidden-sm col-md-2 form-label">&nbsp;</div>
    <div class="col-xs-12 col-sm-6 col-md-4">
      <div class="radio small">
@ -83,8 +83,8 @@
        <label>{{radio-button selection=terminal.type value="none"}} {{format-html-message 'formCommand.console.none'}}</label>
      </div>
    </div>
-  {{/if}}
-</div>
+  </div>
+{{/if}}

 {{#if isService}}
  <div class="row {{unless editing 'form-group'}}">
--- a/app/components/host-pod/component.js
+++ b/app/components/host-pod/component.js
@ -22,6 +22,10 @@ export default Ember.Component.extend(ManageLabels, GroupedInstances, {
    },
  },

+  shouldUpdateLabels: function() {
+    this.initLabels(this.get('model.labels'));
+  }.observes('model.labels'),
+
  filteredInstances: function() {
    let out = this.get('model.instances')||[];

--- a/app/components/modal-auditlog-info/component.js
+++ b/app/components/modal-auditlog-info/component.js
@ -2,7 +2,7 @@ import Ember from 'ember';
 import ModalBase from 'lacsso/components/modal-base';

 export default ModalBase.extend({
-  classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
+  classNames: ['lacsso', 'modal-container', 'full-width-modal'],
  requestObject  : Ember.computed.alias('modalService.modalOpts.requestObject'),
  responseObject  : Ember.computed.alias('modalService.modalOpts.responseObject'),
  requestJSON    : null,
--- a/app/components/modal-confirm-deactivate/component.js
+++ b/app/components/modal-confirm-deactivate/component.js
@ -3,7 +3,7 @@ import { alternateLabel } from 'ui/utils/platform';
 import ModalBase from 'lacsso/components/modal-base';

 export default ModalBase.extend({
-  classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3', 'modal-logs'],
+  classNames: ['lacsso', 'modal-container', 'span-6', 'offset-3'],
  originalModel  : Ember.computed.alias('modalService.modalOpts.originalModel'),
  action         : Ember.computed.alias('modalService.modalOpts.action'),
  alternateLabel : alternateLabel,
--- a/app/components/modal-container-logs/component.js
+++ b/app/components/modal-container-logs/component.js
@ -2,7 +2,7 @@ import Ember from 'ember';
 import ModalBase from 'lacsso/components/modal-base';

 export default ModalBase.extend({
-  classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
+  classNames: ['lacsso', 'modal-container', 'full-width-modal'],
  originalModel: Ember.computed.alias('modalService.modalOpts'),

 });
--- a/app/components/modal-process-error/component.js
+++ b/app/components/modal-process-error/component.js
@ -2,7 +2,7 @@ import Ember from 'ember';
 import ModalBase from 'lacsso/components/modal-base';

 export default ModalBase.extend({
-  classNames: ['lacsso', 'modal-container', 'full-width-modal', 'modal-logs'],
+  classNames: ['lacsso', 'modal-container', 'full-width-modal'],
  exception: Ember.computed.alias('modalService.modalOpts'),
  actions: {
    dismiss: function() {
--- a/app/service/log/template.hbs
+++ b/app/service/log/template.hbs
@ -29,7 +29,7 @@
      </tr>
    {{else}}
      <tr>
-        <td colspan="2">
+        <td colspan="5">
          <div class="text-muted text-center">{{t 'servicePage.logTab.table.body.noData'}}</div>
        </td>
      </tr>
--- a/app/styles/components/_modals.scss
+++ b/app/styles/components/_modals.scss
@ -1,13 +1,10 @@
-.lacsso.modal-overlay.modal-open .modal-container.modal-logs {
-    max-height: 100%;
-}
-
 .lacsso {
  &.full-width-modal {
    &.modal-container {
      width: calc(100% - 40px);
      max-width: 990px;
-      margin: 0 auto;
+      margin-left: auto;
+      margin-right: auto;
    }

  }
--- a/app/styles/layout/_layout.scss
+++ b/app/styles/layout/_layout.scss
@ -243,6 +243,10 @@ UL.list-lines {
  position       : relative;
 }

+.modal-container .footer-actions {
+  margin-bottom: 0;
+}
+
 .well {
  .footer-actions {
    padding-bottom: 0;
--- a/app/utils/multi-stats.js
+++ b/app/utils/multi-stats.js
@ -28,8 +28,8 @@ export default Ember.Object.extend(Ember.Evented, {
  },

  available: function() {
-    return C.ACTIVEISH_STATES.indexOf(this.get('resource.state')) >= 0;
-  }.property('resource.state'),
+    return C.ACTIVEISH_STATES.indexOf(this.get('resource.state')) >= 0 && this.get('resource.healthState') !== 'started-once';
+  }.property('resource.{state,healthState}'),

  active: Ember.computed.and('available', 'connected'),

--- a/package.json
+++ b/package.json
@ -54,7 +54,7 @@
    "forever-agent": "^0.6.1",
    "glob": "^5.0.3",
    "http-proxy": "^1.11.1",
-    "lacsso": "^0.0.31",
+    "lacsso": "^0.0.32",
    "liquid-fire": "0.26.1",
    "loader.js": "^4.0.1",
    "shell-quote": "^1.4.3",