Merge pull request #106 from vincent99/master

Show managed containers grey with no actions

Author: vincent99

app/pods/components/container-widget/component.js

@@ -5,6 +5,7 @@ import HoverActions from 'ui/mixins/hover-actions';
 export default Ember.Component.extend(HoverActions, {
   model: null,
   classNames: ['instance','resource-action-hover'],
+  classNameBindings: ['model.isManaged:managed'],
 
   click: function() {
     // For touch devices, show actions on a click anywhere in the component

app/pods/components/container-widget/template.hbs

@@ -1,4 +1,6 @@
-{{resource-actions-menu model=model choices=model.availableActions}}
+{{#unless model.isManaged}}
+  {{resource-actions-menu model=model choices=model.availableActions}}
+{{/unless}}
 
 <div class="instance-name">
     <i {{bind-attr class="model.stateIcon model.stateColor" tooltip=model.displayState}}></i>

app/pods/container/controller.js

@@ -94,6 +94,8 @@ var ContainerController = Cattle.TransitioningResourceController.extend({
     return ['removed','removing','purging','purged'].indexOf(this.get('state')) === -1;
   }.property('state'),
 
+  isManaged: Ember.computed.notEmpty('systemContainer'),
+
   primaryHost: Ember.computed.alias('hosts.firstObject'),
 });
 

app/pods/container/template.hbs

@@ -17,7 +17,9 @@
         {{transitioningMessage}}
       </div>
       <div class="instance-actions">
-        {{resource-actions model=this choices=availableActions}}
+        {{#unless isManaged}}
+          {{resource-actions model=this choices=availableActions}}
+        {{/unless}}
       </div>
     </div>
   </div>

app/pods/containers/index/template.hbs

@@ -38,7 +38,9 @@
             <div class="text-muted">{{date-calendar container.created}}</div>
           </td>
           <td class="actions">
-            {{resource-actions-menu model=container choices=container.availableActions}}
+            {{#unless container.isManaged}}
+              {{resource-actions-menu model=container choices=container.availableActions}}
+            {{/unless}}
           </td>
         </tr>
       {{else}}

app/pods/containers/route.js

@@ -1,15 +1,8 @@
 import Ember from 'ember';
-import UnmanagedProxy from 'ui/utils/unmanaged-array-proxy';
 
 export default Ember.Route.extend({
   model: function() {
-    return this.get('store').findAll('container').then((all) => {
-      var proxy = UnmanagedProxy.create({
-        sortProperties: ['name','id'],
-        sourceContent: all
-      });
-      return proxy;
-    });
+    return this.get('store').findAll('container');
   },
 
   activate: function() {

app/pods/host/controller.js

@@ -1,6 +1,6 @@
+import Ember from 'ember';
 import Cattle from 'ui/utils/cattle';
 import util from 'ui/utils/util';
-import UnmanagedProxy from 'ui/utils/unmanaged-array-proxy';
 
 var HostController = Cattle.TransitioningResourceController.extend({
   actions: {
@@ -82,12 +82,11 @@ var HostController = Cattle.TransitioningResourceController.extend({
   }.property('ipAddresses','ipAddresses.[]'),
 
   arrangedInstances: function() {
-    var filtered = UnmanagedProxy.create({
-      sortProperties: ['name','id'],
-      sourceContent: this.get('instances')
+    return Ember.ArrayController.create({
+      content: this.get('instances'),
+      sortProperties: ['name','id']
     });
-    return filtered;
-  }.property('instances.@each.{name,id,systemContainer}'),
+  }.property('instances.[]','instances.@each.{name,id}'),
 
   machine: function() {
     var phid = this.get('physicalHostId');

app/pods/host/host-containers/controller.js

@@ -1,17 +1,9 @@
 import Ember from 'ember';
-import UnmanagedProxy from 'ui/utils/unmanaged-array-proxy';
 
 export default Ember.ObjectController.extend({
   actions: {
     newContainer: function() {
       this.transitionToRoute('containers.new', {queryParams: {hostId: this.get('id')}});
     },
   },
-
-  unmanagedInstances: function() {
-    return UnmanagedProxy.create({
-      sortProperties: ['name','id'],
-      sourceContent: this.get('instances')
-    });
-  }.property()
 });

app/pods/host/host-containers/template.hbs

@@ -1,7 +1,7 @@
 <section class="grid-header">
   <div class="row">
     <div class="col-sm-6">
-      <h3>Containers ({{unmanagedInstances.length}})</h3>
+      <h3>Containers ({{instances.length}})</h3>
     </div>
     <div class="col-sm-6 text-right">
       <button {{action "newContainer"}} class="btn btn-sm btn-primary">Add Container</button>
@@ -20,7 +20,7 @@
       </tr>
     </thead>
     <tbody>
-      {{#each container in unmanagedInstances itemController="container"}}
+      {{#each container in instances itemController="container"}}
         <tr>
           <td>
             <span {{bind-attr class=":badge :state container.stateBackground"}}>
@@ -37,7 +37,9 @@
             <div class="text-muted">{{date-calendar container.created}}</div>
           </td>
           <td class="actions">
-            {{resource-actions-menu model=container choices=container.availableActions}}
+            {{#unless container.isManaged}}
+              {{resource-actions-menu model=container choices=container.availableActions}}
+            {{/unless}}
           </td>
         </tr>
       {{else}}

app/styles/host.scss

@@ -221,7 +221,7 @@ $instance-ip: #9a9a9a;
   }
 }
 
-.instance-ip {
+.instance-ip, .instance.managed A {
   color: $instance-ip;
 }
 
@@ -269,7 +269,8 @@ $instance-ip: #9a9a9a;
 .touch .instance {
   padding-right: 31px;
 
-  &.add-container {
+  &.add-container,
+  &.managed {
     padding-right: 10px;
   }
 }