Skip to content

Commit

Permalink
tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
lgfa29 committed Mar 16, 2022
1 parent a9d64b8 commit 8116ebc
Show file tree
Hide file tree
Showing 12 changed files with 126 additions and 3 deletions.
6 changes: 6 additions & 0 deletions ui/app/adapters/evaluation.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { get } from '@ember/object';
import ApplicationAdapter from './application';

export default class EvaluationAdapter extends ApplicationAdapter {
Expand All @@ -6,4 +7,9 @@ export default class EvaluationAdapter extends ApplicationAdapter {
result.meta = { nextToken: headers['x-nomad-nexttoken'] };
return result;
}

urlForFindRecord(id, modelName, snapshot) {
let url = super.urlForFindRecord(...arguments);
return `${url}?related=true`;
}
}
15 changes: 15 additions & 0 deletions ui/app/controllers/evaluations/evaluation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import Controller from '@ember/controller';

export default class EvaluationController extends Controller {
get eval() {
return this.model;
}

get breadcrumb() {
return {
title: 'Evaluation',
label: this.eval.get('shortId'),
args: ['evaluations.evaluation', this.eval.get('id')],
};
}
}
23 changes: 23 additions & 0 deletions ui/app/controllers/evaluations/evaluation/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* eslint-disable ember/no-observers */
/* eslint-disable ember/no-incorrect-calls-with-inline-anonymous-functions */
import { alias } from '@ember/object/computed';
import Controller from '@ember/controller';
import { action, computed } from '@ember/object';
import { observes } from '@ember-decorators/object';
import { scheduleOnce } from '@ember/runloop';
import { task } from 'ember-concurrency';
import intersection from 'lodash.intersection';
import Sortable from 'nomad-ui/mixins/sortable';
import Searchable from 'nomad-ui/mixins/searchable';
import messageFromAdapterError from 'nomad-ui/utils/message-from-adapter-error';
import {
serialize,
deserializedQueryParam as selection,
} from 'nomad-ui/utils/qp-serialize';
import classic from 'ember-classic-decorator';

@classic
export default class EvaluationController extends Controller.extend(
Sortable,
Searchable
) {}
30 changes: 30 additions & 0 deletions ui/app/models/evaluation-stub.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { bool, equal } from '@ember/object/computed';
import Model from '@ember-data/model';
import { attr, belongsTo, hasMany } from '@ember-data/model';
import { fragmentArray } from 'ember-data-model-fragments/attributes';
import shortUUIDProperty from '../utils/properties/short-uuid';
import Fragment from 'ember-data-model-fragments/fragment';

export default class EvaluationStub extends Fragment {
@shortUUIDProperty('evalId') shortId;
@attr('string') evalId;
@attr('string') type;
@attr('string') triggeredBy;
@attr('string') status;
@attr('string') statusDescription;

@belongsTo('job') job;
@belongsTo('node') node;

get hasJob() {
return !!this.plainJobId;
}

get hasNode() {
return !!this.belongsTo('node').id();
}

get nodeId() {
return this.belongsTo('node').id();
}
}
4 changes: 3 additions & 1 deletion ui/app/models/evaluation.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { bool, equal } from '@ember/object/computed';
import Model from '@ember-data/model';
import { attr, belongsTo } from '@ember-data/model';
import { attr, belongsTo, hasMany } from '@ember-data/model';
import { fragmentArray } from 'ember-data-model-fragments/attributes';
import shortUUIDProperty from '../utils/properties/short-uuid';

Expand All @@ -21,6 +21,8 @@ export default class Evaluation extends Model {
@belongsTo('job') job;
@belongsTo('node') node;

@fragmentArray('evaluation-stub') relatedEvals;

@attr('number') modifyIndex;
@attr('date') modifyTime;

Expand Down
4 changes: 3 additions & 1 deletion ui/app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ Router.map(function () {
});

// if we don't include function() the outlet won't render
this.route('evaluations', function () {});
this.route('evaluations', function () {
this.route('evaluation', { path: '/:evaluation_id' });
});

this.route('not-found', { path: '/*' });
});
10 changes: 10 additions & 0 deletions ui/app/routes/evaluations/evaluation.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { inject as service } from '@ember/service';
import Route from '@ember/routing/route';

export default class EvaluationRoute extends Route {
@service store;

model(params) {
return this.store.findRecord('evaluation', params.evaluation_id);
}
}
4 changes: 4 additions & 0 deletions ui/app/routes/evaluations/evaluation/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import Route from '@ember/routing/route';
import WithWatchers from 'nomad-ui/mixins/with-watchers';

export default class EvaluationRoute extends Route.extend(WithWatchers) {}
23 changes: 23 additions & 0 deletions ui/app/serializers/evaluation-stub.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { inject as service } from '@ember/service';
import { get } from '@ember/object';
import ApplicationSerializer from './application';
import classic from 'ember-classic-decorator';

@classic
export default class EvaluationStub extends ApplicationSerializer {
@service system;

mapToArray = ['FailedTGAllocs'];
separateNanos = ['CreateTime', 'ModifyTime'];

normalize(typeHash, hash) {
console.log(hash);
console.log(typeHash);
hash.EvalId = hash.ID;
hash.PlainJobId = hash.JobID;
hash.Namespace = hash.Namespace || get(hash, 'Job.Namespace') || 'default';
hash.JobID = JSON.stringify([hash.JobID, hash.Namespace]);

return super.normalize(typeHash, hash);
}
}
7 changes: 7 additions & 0 deletions ui/app/templates/evaluations/evaluation.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Breadcrumb @crumb={{this.breadcrumb}} />{{outlet}}
<h1>Related Evals</h1>
<ul>
{{#each model.relatedEvals as |e|}}
<li>{{e.evalId}}</li>
{{/each}}
</ul>
1 change: 1 addition & 0 deletions ui/app/templates/evaluations/evaluation/index.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h1>Hi</h1>
2 changes: 1 addition & 1 deletion ui/app/templates/evaluations/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<t.body as |row|>
<tr data-test-evaluation="{{row.model.shortId}}">
<td data-test-id>
{{row.model.shortId}}
<LinkTo @model={{row.model}} @route="evaluations.evaluation">{{row.model.shortId}}</LinkTo>
</td>
<td data-test-id>
{{#if row.model.hasJob}}
Expand Down

0 comments on commit 8116ebc

Please sign in to comment.