Nomad Services: job routes, model, and serializer updates

ui/app/adapters/service.js

@@ -0,0 +1,5 @@
+import Watchable from './watchable';
+import classic from 'ember-classic-decorator';
+
+@classic
+export default class ServiceAdapter extends Watchable {}

ui/app/adapters/watchable.js

@@ -143,9 +143,9 @@ export default class Watchable extends ApplicationAdapter {
   reloadRelationship(
     model,
     relationshipName,
-    options = { watch: false, abortController: null }
+    options = { watch: false, abortController: null, replace: false }
   ) {
-    const { watch, abortController } = options;
+    const { watch, abortController, replace } = options;
     const relationship = model.relationshipFor(relationshipName);
     if (relationship.kind !== 'belongsTo' && relationship.kind !== 'hasMany') {
       throw new Error(
@@ -185,6 +185,9 @@ export default class Watchable extends ApplicationAdapter {
             modelClass,
             json
           );
+          if (replace) {
+            store.unloadAll(relationship.type);
+          }
           store.push(normalizedData);
         },
         (error) => {

ui/app/controllers/allocations/allocation/index.js

@@ -55,7 +55,7 @@ export default class IndexController extends Controller.extend(Sortable) {
   @computed('[email protected]')
   get taskServices() {
     return this.get('tasks')
-      .map((t) => (t && t.get('services') || []).toArray())
+      .map((t) => ((t && t.get('services')) || []).toArray())
       .flat()
       .compact();
   }

ui/app/controllers/jobs/job/services.js

@@ -0,0 +1,3 @@
+import Controller from '@ember/controller';
+
+export default class JobsJobServicesController extends Controller {}

ui/app/controllers/jobs/job/services/index.js

@@ -0,0 +1,28 @@
+import Controller from '@ember/controller';
+import WithNamespaceResetting from 'nomad-ui/mixins/with-namespace-resetting';
+import { alias } from '@ember/object/computed';
+import { computed } from '@ember/object';
+
+export default class JobsJobServicesIndexController extends Controller.extend(
+  WithNamespaceResetting
+) {
+  @alias('model') job;
+
+  // Services, grouped by name, with aggregatable allocations.
+  @computed('job.services.@each.{name,allocation}', 'job.services.length')
+  get services() {
+    return this.job.services.reduce((m, n) => {
+      n.allocations = [];
+      let siblingServiceInstance = m.findBy('name', n.name);
+      if (!siblingServiceInstance) {
+        siblingServiceInstance = n;
+        m.push(n);
+      }
+      siblingServiceInstance.allocations = [
+        ...(siblingServiceInstance.allocations || []),
+        n.allocation,
+      ];
+      return m;
+    }, []);
+  }
+}

ui/app/models/job.js

@@ -141,6 +141,7 @@ export default class Job extends Model {
   @hasMany('variables') variables;
   @belongsTo('namespace') namespace;
   @belongsTo('job-scale') scaleState;
+  @hasMany('services') services;
 
   @hasMany('recommendation-summary') recommendationSummaries;
 

ui/app/models/service-fragment.js

@@ -0,0 +1,11 @@
+import { attr } from '@ember-data/model';
+import Fragment from 'ember-data-model-fragments/fragment';
+import { fragment } from 'ember-data-model-fragments/attributes';
+
+export default class Service extends Fragment {
+  @attr('string') name;
+  @attr('string') portLabel;
+  @attr() tags;
+  @attr('string') onUpdate;
+  @fragment('consul-connect') connect;
+}

ui/app/models/service.js

@@ -1,11 +1,21 @@
-import { attr } from '@ember-data/model';
-import Fragment from 'ember-data-model-fragments/fragment';
-import { fragment } from 'ember-data-model-fragments/attributes';
+// @ts-check
+import { attr, belongsTo } from '@ember-data/model';
+import Model from '@ember-data/model';
+import { alias } from '@ember/object/computed';
 
-export default class Service extends Fragment {
-  @attr('string') name;
-  @attr('string') portLabel;
+export default class Service extends Model {
+  @belongsTo('allocation') allocation;
+  @belongsTo('job') job;
+  @belongsTo('node') node;
+
+  @attr('string') address;
+  @attr('number') createIndex;
+  @attr('string') datacenter;
+  @attr('number') modifyIndex;
+  @attr('string') namespace;
+  @attr('number') port;
+  @attr('string') serviceName;
   @attr() tags;
-  @attr('string') onUpdate;
-  @fragment('consul-connect') connect;
+
+  @alias('serviceName') name;
 }

ui/app/models/task-group.js

@@ -35,7 +35,7 @@ export default class TaskGroup extends Fragment {
 
   @fragmentArray('task') tasks;
 
-  @fragmentArray('service') services;
+  @fragmentArray('service-fragment') services;
 
   @fragmentArray('volume-definition') volumes;
 

ui/app/models/task.js

@@ -48,7 +48,7 @@ export default class Task extends Fragment {
   @attr('number') reservedCPU;
   @attr('number') reservedDisk;
   @attr('number') reservedEphemeralDisk;
-  @fragmentArray('service') services;
+  @fragmentArray('service-fragment') services;
 
   @fragmentArray('volume-mount', { defaultValue: () => [] }) volumeMounts;
 

ui/app/router.js

@@ -24,6 +24,9 @@ Router.map(function () {
       this.route('evaluations');
       this.route('allocations');
       this.route('clients');
+      this.route('services', function () {
+        this.route('service', { path: '/:name' });
+      });
     });
   });
 

ui/app/routes/jobs/job/services.js

@@ -0,0 +1,21 @@
+import Route from '@ember/routing/route';
+import WithWatchers from 'nomad-ui/mixins/with-watchers';
+import { collect } from '@ember/object/computed';
+import { watchRelationship } from 'nomad-ui/utils/properties/watch';
+
+export default class JobsJobServicesRoute extends Route.extend(WithWatchers) {
+  model() {
+    const job = this.modelFor('jobs.job');
+    return job && job.get('services').then(() => job);
+  }
+
+  startWatchers(controller, model) {
+    if (model) {
+      controller.set('watchServices', this.watchServices.perform(model));
+    }
+  }
+
+  @watchRelationship('services', true) watchServices;
+
+  @collect('watchServices') watchers;
+}

ui/app/routes/jobs/job/services/index.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class JobsJobServicesIndexRoute extends Route {}

ui/app/routes/jobs/job/services/service.js

@@ -0,0 +1,3 @@
+import Route from '@ember/routing/route';
+
+export default class JobsJobServicesServiceRoute extends Route {}

ui/app/serializers/job.js

@@ -101,6 +101,11 @@ export default class JobSerializer extends ApplicationSerializer {
           related: buildURL(`${jobURL}/evaluations`, { namespace }),
         },
       },
+      services: {
+        links: {
+          related: buildURL(`${jobURL}/services`, { namespace }),
+        },
+      },
       variables: {
         links: {
           related: buildURL(`/${apiNamespace}/vars`, {

ui/app/serializers/service-fragment.js

@@ -0,0 +1,11 @@
+import ApplicationSerializer from './application';
+import classic from 'ember-classic-decorator';
+
+@classic
+export default class ServiceFragmentSerializer extends ApplicationSerializer {
+  attrs = {
+    connect: 'Connect',
+  };
+
+  arrayNullOverrides = ['Tags'];
+}

ui/app/serializers/service.js

@@ -1,11 +1,9 @@
 import ApplicationSerializer from './application';
-import classic from 'ember-classic-decorator';
 
-@classic
 export default class ServiceSerializer extends ApplicationSerializer {
-  attrs = {
-    connect: 'Connect',
-  };
-
-  arrayNullOverrides = ['Tags'];
+  normalize(typeHash, hash) {
+    hash.AllocationID = hash.AllocID; // TODO: keyForRelationship maybe?
+    hash.JobID = JSON.stringify([hash.JobID, hash.Namespace]);
+    return super.normalize(typeHash, hash);
+  }
 }

ui/app/templates/components/job-service-row.hbs

@@ -0,0 +1,16 @@
+<tr data-test-service={{@service.id}}>
+  <td>
+    {{@service.name}}
+  </td>
+  <td>
+    {{@service.node.name}}
+  </td>
+  <td>
+    {{#each @service.tags as |tag|}}
+			<span class="tag">{{tag}}</span>
+    {{/each}}
+  </td>
+	<td>
+		{{@service.allocations.length}} {{pluralize "allocation" @service.allocations.length}}
+	</td>
+</tr>

ui/app/templates/components/job-subnav.hbs

@@ -68,5 +68,14 @@
         </LinkTo>
       </li>
     {{/if}}
+    <li data-test-tab="services">
+      <LinkTo
+        @route="jobs.job.services"
+        @model={{@job}}
+        @activeClass="is-active"
+      >
+        Services
+      </LinkTo>
+    </li>
   </ul>
 </div>

ui/app/templates/jobs/job/services.hbs

@@ -0,0 +1,5 @@
+{{page-title "Job " @model.name " services"}}
+<JobSubnav @job={{@model}} />
+<section class="section">
+	{{outlet}}
+</section>

ui/app/templates/jobs/job/services/index.hbs

@@ -0,0 +1,29 @@
+{{#if this.services.length}}
+	<ListTable
+		@source={{this.services}}
+		@sortProperty={{this.sortProperty}}
+		@sortDescending={{this.sortDescending}}
+		@class="with-foot" as |t|
+	>
+		<t.head>
+			<t.sort-by @prop="name">name</t.sort-by>
+			<t.sort-by @prop="client" class="is-200px is-truncatable">Client</t.sort-by>
+			<th>Tags</th>
+			<t.sort-by @prop="numAllocs">Number of Alocations</t.sort-by>
+		</t.head>
+		<t.body as |row|>
+			<JobServiceRow @service={{row.model}} />
+		</t.body>
+	</ListTable>
+{{else}}
+	<div class="boxed-section-body">
+		<div class="empty-message" data-test-empty-services-list>
+			<h3 class="empty-message-headline" data-test-empty-services-list-headline>
+				No Services
+			</h3>
+			<p class="empty-message-body">
+				No services running on {{this.job.name}}.
+			</p>
+		</div>
+	</div>
+{{/if}}

ui/app/templates/jobs/job/services/service.hbs

@@ -0,0 +1,2 @@
+{{page-title "Service"}}
+{{outlet}}

ui/app/utils/properties/watch.js

@@ -39,7 +39,7 @@ export function watchRecord(modelName) {
   }).drop();
 }
 
-export function watchRelationship(relationshipName) {
+export function watchRelationship(relationshipName, replace = false) {
   return task(function* (model, throttle = 2000) {
     assert(
       'To watch a relationship, the adapter of the model provided to the watchRelationship task MUST extend Watchable',
@@ -54,6 +54,7 @@ export function watchRelationship(relationshipName) {
             .reloadRelationship(model, relationshipName, {
               watch: true,
               abortController: controller,
+              replace,
             }),
           wait(throttle),
         ]);

ui/tests/acceptance/regions-test.js

@@ -155,7 +155,6 @@ module('Acceptance | regions (many)', function (hooks) {
     const newRegion = server.db.regions[1].id;
 
     await Allocation.visit({ id: server.db.allocations[0].id });
-    await this.pauseTest();
 
     await selectChoose('[data-test-region-switcher-parent]', newRegion);
 

ui/tests/unit/adapters/service-test.js

@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Adapter | service', function (hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function (assert) {
+    let adapter = this.owner.lookup('adapter:service');
+    assert.ok(adapter);
+  });
+});

ui/tests/unit/controllers/jobs/job/services-test.js

@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Controller | jobs/job/services', function (hooks) {
+  setupTest(hooks);
+
+  // TODO: Replace this with your real tests.
+  test('it exists', function (assert) {
+    let controller = this.owner.lookup('controller:jobs/job/services');
+    assert.ok(controller);
+  });
+});

ui/tests/unit/controllers/jobs/job/services/index-test.js

@@ -0,0 +1,12 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Controller | jobs/job/services/index', function (hooks) {
+  setupTest(hooks);
+
+  // TODO: Replace this with your real tests.
+  test('it exists', function (assert) {
+    let controller = this.owner.lookup('controller:jobs/job/services/index');
+    assert.ok(controller);
+  });
+});

ui/tests/unit/models/service-fragment-test.js

@@ -0,0 +1,13 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Model | service fragment', function (hooks) {
+  setupTest(hooks);
+
+  // Replace this with your real tests.
+  test('it exists', function (assert) {
+    let store = this.owner.lookup('service:store');
+    let model = store.createRecord('service-fragment', {});
+    assert.ok(model);
+  });
+});

ui/tests/unit/routes/jobs/job/services/index-test.js

@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | jobs/job/services/index', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let route = this.owner.lookup('route:jobs/job/services/index');
+    assert.ok(route);
+  });
+});

ui/tests/unit/routes/jobs/job/services/service-test.js

@@ -0,0 +1,11 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module('Unit | Route | jobs/job/services/service', function (hooks) {
+  setupTest(hooks);
+
+  test('it exists', function (assert) {
+    let route = this.owner.lookup('route:jobs/job/services/service');
+    assert.ok(route);
+  });
+});