Address headers and ID bugs

hashicorp · Mar 3, 2018 · 421f082 · 421f082
1 parent 5dd83fd
commit 421f082
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/ui/app/adapters/watchable.js b/ui/app/adapters/watchable.js
@@ -104,10 +104,11 @@ export default ApplicationAdapter.extend({
   },
 
   handleResponse(status, headers, payload, requestData) {
-    const newIndex = headers['X-Nomad-Index'];
+    const newIndex = headers['x-nomad-index'];
     if (newIndex) {
       this.get('watchList').setIndexFor(requestData.url, newIndex);
     }
+
     return this._super(...arguments);
   },
 

diff --git a/ui/app/components/distribution-bar.js b/ui/app/components/distribution-bar.js
@@ -2,7 +2,7 @@ import Component from '@ember/component';
 import { computed, observer } from '@ember/object';
 import { run } from '@ember/runloop';
 import { assign } from '@ember/polyfills';
-import { guidFor } from '@ember/object/internals';
+import { guidFor, copy } from '@ember/object/internals';
 import d3 from 'npm:d3-selection';
 import 'npm:d3-transition';
 import WindowResizable from '../mixins/window-resizable';
@@ -22,8 +22,8 @@ export default Component.extend(WindowResizable, {
   tooltipStyle: styleStringProperty('tooltipPosition'),
   maskId: null,
 
-  _data: computed('data.@each.{value,label,className,layers}', function() {
-    const data = this.get('data');
+  _data: computed('data', function() {
+    const data = copy(this.get('data'), true);
     const sum = data.mapBy('value').reduce(sumAggregate, 0);
 
     return data.map(({ label, value, className, layers }, index) => ({

diff --git a/ui/app/utils/properties/watch.js b/ui/app/utils/properties/watch.js
@@ -1,13 +1,12 @@
 import Ember from 'ember';
-import { typeOf } from '@ember/utils';
 import { get } from '@ember/object';
 import RSVP from 'rsvp';
 import { task } from 'ember-concurrency';
 import wait from 'nomad-ui/utils/wait';
 
 export function watchRecord(modelName) {
   return task(function*(id, throttle = 2000) {
-    if (typeOf(id) === 'object') {
+    if (typeof id === 'object') {
       id = get(id, 'id');
     }
     while (!Ember.testing) {

diff --git a/ui/mirage/config.js b/ui/mirage/config.js
@@ -35,7 +35,7 @@ export default function() {
         response.headers['X-Nomad-Index'] = index;
         return response;
       }
-      return new Response(200, { 'X-Nomad-Index': index }, response);
+      return new Response(200, { 'x-nomad-index': index }, response);
     };
   };