rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move volumes into host

This commit is contained in:
Vincent Fiduccia 2015-06-09 12:40:56 -07:00
parent 74b0ac2473
commit c123d85e10
14 changed files with 141 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/authenticated/route.js
View File

@ -323,7 +323,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
if ( volume ) if ( volume )
{ {
var mounts = volume.get('mounts'); var mounts = volume.get('mounts');
if ( !Ember.isArray('mounts') ) if ( !Ember.isArray(mounts) )
{ {
mounts = []; mounts = [];
volume.set('mounts',mounts); volume.set('mounts',mounts);

1
app/components/page-header/template.hbs
View File

@ -136,7 +136,6 @@
{{#if isInfrastructure}} {{#if isInfrastructure}}
{{#link-to "hosts"}}<i class="ss-database"></i> Hosts{{/link-to}} {{#link-to "hosts"}}<i class="ss-database"></i> Hosts{{/link-to}}
{{#link-to "containers"}}<i class="ss-box"></i> Containers{{/link-to}} {{#link-to "containers"}}<i class="ss-box"></i> Containers{{/link-to}}
{{#link-to "volumes"}}<i class="ss-hdd"></i> Volumes{{/link-to}}
{{#link-to "loadbalancers"}}<i class="ss-fork"></i> Load Balancers{{/link-to}} {{#link-to "loadbalancers"}}<i class="ss-fork"></i> Load Balancers{{/link-to}}
{{#link-to "loadbalancerconfigs"}}<i class="ss-file"></i> Balancer Configs{{/link-to}} {{#link-to "loadbalancerconfigs"}}<i class="ss-file"></i> Balancer Configs{{/link-to}}
{{/if}} {{/if}}

1
app/components/resource-actions-menu/component.js
View File

@ -5,6 +5,7 @@ export default Ember.Component.extend({
choices: null, choices: null,
classNames: ['resource-actions'], classNames: ['resource-actions'],
classNameBindings: ['activeActions.length::hide'],
open: false, open: false,
didInsertElement: function() { didInsertElement: function() {

9
app/host/storage/controller.js Normal file
View File

@ -0,0 +1,9 @@
import Cattle from 'ui/utils/cattle';
export default Cattle.CollectionController.extend({
nonRootVolumes: function() {
return this.get('arrangedContent').filter(function(volume) {
return !volume.get('instanceId') && volume.get('state') !== 'purged';
});
}.property('arrangedContent.@each.{instanceId,state}')
});

19
app/host/storage/route.js Normal file
View File

@ -0,0 +1,19 @@
import Ember from 'ember';
export default Ember.Route.extend({
model: function() {
var host = this.modelFor('host');
var out = [];
return host.followLink('storagePools').then((pools) => {
var promises = pools.map((pool) => {
return pool.followLink('volumes',{include: 'mounts'}).then((volumes) => {
out.pushObjects((volumes||[]).toArray());
});
});
return Ember.RSVP.all(promises).then(() => {
return out;
});
});
}
});

55
app/host/storage/template.hbs
View File

@ -1 +1,54 @@
<h4>Coming soon, replacement for the Volumes tab...</h4> <section>
<table class="grid fixed" style="margin-bottom: 0;">
<thead>
<tr>
<th width="90">State</th>
<th>Host Path</th>
<th>Mounts</th>
<th class="actions" width="50">&nbsp;</th>
</tr>
</thead>
<tbody>
{{#each volume in nonRootVolumes itemController="volume"}}
<tr>
<td>
<span {{bind-attr class=":badge :state volume.stateBackground"}}>
{{volume.displayState}}
</span>
</td>
<td>
<div class="clip with-zeroclip">
{{volume.displayUri}}
</div>
{{zero-clipboard text=volume.displayUri class="with-clip"}}
</td>
<td>
{{#if volume.activeMounts.length}}
{{#each mount in volume.activeMounts itemController="mount"}}
<div>
{{#link-to "container" mount.instanceId}}{{mount.instance.name}}{{/link-to}}:{{mount.path}}
{{#if (eq mount.permissions "ro")}}
<span class="text-muted">(read-only)</span>
{{/if}}
</div>
{{/each}}
{{else}}
<span class="text-muted">None</span>
{{/if}}
</td>
<td class="actions">
{{#if volume.availableActions.length}}
{{resource-actions-menu model=volume choices=volume.availableActions}}
{{/if}}
</td>
</tr>
{{else}}
<tr><td colspan="4" class="text-center text-muted">This host does not have any containers yet.</td></tr>
{{/each}}
</tbody>
</table>
</section>

2
app/initializers/touch.js
View File

@ -1,5 +1,5 @@
export function initialize(/*container, application*/) { export function initialize(/*container, application*/) {
// Add 'touch' or 'no-touch' to the <body> so CSS can depend on the devicve type. // Add 'touch' or 'no-touch' to the <body> so CSS can depend on the device type.
var body = $('BODY'); var body = $('BODY');
if ('ontouchstart' in document.documentElement) if ('ontouchstart' in document.documentElement)

1
app/loadbalancer/hosts/new/controller.js
View File

@ -15,6 +15,7 @@ export default Ember.Controller.extend({
}, },
save: function() { save: function() {
this.set('errors', null);
this.set('saving',true); this.set('saving',true);
var promises = []; var promises = [];
var balancer = this.get('model'); var balancer = this.get('model');

7
app/loadbalancer/hosts/new/route.js
View File

@ -25,6 +25,13 @@ export default OverlayRoute.extend({
this.render({into: 'application', outlet: 'overlay'}); this.render({into: 'application', outlet: 'overlay'});
}, },
resetController: function (controller, isExisting/*, transition*/) {
if (isExisting)
{
controller.set('errors', null);
}
},
actions: { actions: {
cancel: function() { cancel: function() {
this.transitionTo('loadbalancer.hosts'); this.transitionTo('loadbalancer.hosts');

21
app/loadbalancer/targets/new/controller.js
View File

@ -4,6 +4,7 @@ import TargetChoices from 'ui/mixins/target-choices';
export default Ember.Controller.extend(TargetChoices, { export default Ember.Controller.extend(TargetChoices, {
error: null, error: null,
editing: false, editing: false,
saving: false,
actions: { actions: {
addTargetContainer: function() { addTargetContainer: function() {
@ -17,6 +18,8 @@ export default Ember.Controller.extend(TargetChoices, {
}, },
save: function() { save: function() {
this.set('saving',true);
this.set('errors', null);
var promises = []; var promises = [];
var balancer = this.get('model'); var balancer = this.get('model');
@ -34,6 +37,24 @@ export default Ember.Controller.extend(TargetChoices, {
return Ember.RSVP.all(promises,'Add multiple targets').then(() => { return Ember.RSVP.all(promises,'Add multiple targets').then(() => {
this.send('cancel'); this.send('cancel');
}).catch((err) => {
if ( err.status === 422 && err.code === 'NotUnique' )
{
if ( this.get('targetsArray.length') > 1 )
{
this.set('errors',['This load balancer is already has one or more of the specified targets']);
}
else
{
this.set('errors',['This load balancer already has the specified targets']);
}
}
else
{
this.set('errors', [err]);
}
}).finally(() => {
this.set('saving', false);
}); });
}, },
}, },

7
app/loadbalancer/targets/new/route.js
View File

@ -25,6 +25,13 @@ export default OverlayRoute.extend({
this.render({into: 'application', outlet: 'overlay'}); this.render({into: 'application', outlet: 'overlay'});
}, },
resetController: function (controller, isExisting/*, transition*/) {
if (isExisting)
{
controller.set('errors', null);
}
},
actions: { actions: {
cancel: function() { cancel: function() {
this.goToPrevious(); this.goToPrevious();

1
app/loadbalancer/targets/new/template.hbs
View File

@ -1,5 +1,6 @@
<section class="horizontal-form container-fluid"> <section class="horizontal-form container-fluid">
<h2>Add Targets</h2> <h2>Add Targets</h2>
{{top-errors errors=errors}}
<div class="row"> <div class="row">
<div class="col-xs-6 col-md-8 col-md-offset-2"> <div class="col-xs-6 col-md-8 col-md-offset-2">

9
app/mount/controller.js
View File

@ -4,6 +4,15 @@ import Ember from 'ember';
var MountController = Cattle.TransitioningResourceController.extend({ var MountController = Cattle.TransitioningResourceController.extend({
isReadWrite: Ember.computed.equal('permissions','rw'), isReadWrite: Ember.computed.equal('permissions','rw'),
isReadOnly: Ember.computed.equal('permissions','ro'), isReadOnly: Ember.computed.equal('permissions','ro'),
instance: function() {
var proxy = Ember.ObjectProxy.create({content: {}});
this.get('store').find('container', this.get('instanceId')).then((container) => {
proxy.set('content', container);
});
return proxy;
}.property('instanceId'),
}); });
MountController.reopenClass({ MountController.reopenClass({

10
app/styles/zero-clipboard.scss
View File

@ -29,3 +29,13 @@
@extend .text-muted; @extend .text-muted;
padding: 0; padding: 0;
} }
.zeroclip.with-clip {
display: inline-block
}
.clip.with-zeroclip {
max-width: calc(100% - 20px);
float: left;
padding-right: 3px
}