mirror of
https://github.com/kemko/nomad.git
synced 2026-01-04 01:15:43 +03:00
add on update to services table in allocation details (#10153)
* add on update to services table in allocation details * populate onupdate test data
This commit is contained in:
@@ -6,5 +6,6 @@ export default class Service extends Fragment {
|
||||
@attr('string') name;
|
||||
@attr('string') portLabel;
|
||||
@attr() tags;
|
||||
@attr('string') onUpdate;
|
||||
@fragment('consul-connect') connect;
|
||||
}
|
||||
|
||||
@@ -165,6 +165,7 @@
|
||||
<th class="is-2">Name</th>
|
||||
<th class="is-1">Port</th>
|
||||
<td>Tags</td>
|
||||
<td>On Update</td>
|
||||
<td>Connect?</td>
|
||||
<td>Upstreams</td>
|
||||
</t.head>
|
||||
@@ -173,6 +174,7 @@
|
||||
<td data-test-service-name>{{row.model.name}}</td>
|
||||
<td data-test-service-port>{{row.model.portLabel}}</td>
|
||||
<td data-test-service-tags>{{join ", " row.model.tags}}</td>
|
||||
<td data-test-service-onupdate>{{row.model.onUpdate}}</td>
|
||||
<td data-test-service-connect>{{if row.model.connect "Yes" "No"}}</td>
|
||||
<td data-test-service-upstreams>
|
||||
{{#each row.model.connect.sidecarService.proxy.upstreams as |upstream|}}
|
||||
|
||||
@@ -2,9 +2,12 @@ import { Factory } from 'ember-cli-mirage';
|
||||
import faker from 'nomad-ui/mirage/faker';
|
||||
import { provide } from '../utils';
|
||||
|
||||
const ON_UPDATE = ['default', 'ignore', 'ignore_warnings'];
|
||||
|
||||
export default Factory.extend({
|
||||
name: id => `${faker.hacker.noun().dasherize()}-${id}-service`,
|
||||
portLabel: () => faker.hacker.noun().dasherize(),
|
||||
onUpdate: faker.helpers.randomize(ON_UPDATE),
|
||||
tags: () => {
|
||||
if (!faker.random.boolean()) {
|
||||
return provide(
|
||||
|
||||
@@ -240,6 +240,7 @@ module('Acceptance | allocation detail', function(hooks) {
|
||||
|
||||
assert.equal(renderedService.name, serverService.name);
|
||||
assert.equal(renderedService.port, serverService.portLabel);
|
||||
assert.equal(renderedService.onUpdate, serverService.onUpdate);
|
||||
assert.equal(renderedService.tags, (serverService.tags || []).join(', '));
|
||||
|
||||
assert.equal(renderedService.connect, serverService.Connect ? 'Yes' : 'No');
|
||||
|
||||
@@ -93,6 +93,7 @@ export default create({
|
||||
name: text('[data-test-service-name]'),
|
||||
port: text('[data-test-service-port]'),
|
||||
tags: text('[data-test-service-tags]'),
|
||||
onUpdate: text('[data-test-service-onupdate]'),
|
||||
connect: text('[data-test-service-connect]'),
|
||||
upstreams: text('[data-test-service-upstreams]'),
|
||||
}),
|
||||
|
||||
Reference in New Issue
Block a user