luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Ensure we catch empty ID's for single nodes also 

I don't think this would have a large effect on the UI whichever but
best to make sure
This commit is contained in:
John Cowen 2018-07-03 14:48:04 +01:00
parent 6e3ad50e99
commit addbf89c63
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui-v2/app/adapters/node.js
View File

@ -1,6 +1,14 @@
import Adapter from './application';
import { PRIMARY_KEY, SLUG_KEY } from 'consul-ui/models/node';
import { OK as HTTP_OK } from 'consul-ui/utils/http/status';
// TODO: Looks like ID just isn't used at all
// consider just using .Node for the SLUG_KEY
const fillSlug = function(item) {
if (item[SLUG_KEY] === '') {
item[SLUG_KEY] = item['Node'];
}
return item;
};
export default Adapter.extend({
urlForQuery: function(query, modelName) {
return this.appendURL('internal/ui/nodes', [], this.cleanQuery(query));
@ -14,6 +22,7 @@ export default Adapter.extend({
const url = this.parseURL(requestData.url);
switch (true) {
case this.isQueryRecord(url):
response = fillSlug(response);
response = {
...response,
...{
@ -23,9 +32,7 @@ export default Adapter.extend({
break;
default:
response = response.map((item, i, arr) => {
if (item[SLUG_KEY] === '') {
item[SLUG_KEY] = item['Node'];
}
item = fillSlug(item);
return {
...item,
...{