[#136164537] - Fixed up wiring of front-end actions to backend.

MeasureTheFuture · Mar 2, 2017 · 26aafe6 · 26aafe6
1 parent 495b1cb
commit 26aafe6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/frontend/src/components/primaryActions.jsx b/frontend/src/components/primaryActions.jsx
@@ -90,6 +90,7 @@ CalibrateAction.contextTypes = {
 var SaveAction = React.createClass({
   handleSave: function() {
     const { store } = this.context;
+    console.log(store);
     UpdateActiveLocation(store, "name", document.getElementById('locationInput').value);
     store.dispatch({ type:'SAVE_LOCATION' })
   },
@@ -128,7 +129,7 @@ var SettingsAction = React.createClass({
 
   render: function() {
     return (
-        <a href="#" onClick={this.handleSettings}>[<i className="fa fa-cog"></i> settings]</a>
+        <a id="settings" href="#" onClick={this.handleSettings}>[<i className="fa fa-cog"></i> settings]</a>
     );
   }
 });

diff --git a/frontend/src/reducers/index.js b/frontend/src/reducers/index.js
@@ -47,7 +47,7 @@ function SaveActiveLocation(store) {
 
   // Push the active location to the backend.
   var httpreq = new XMLHttpRequest();
-  httpreq.open("PUT", "http://"+window.location.host+"/scouts/"+l.id, true);
+  httpreq.open("PUT", "http://"+window.location.host+"/scouts/"+l.uuid, true);
   httpreq.send(JSON.stringify(l));
   httpreq.onreadystatechange = function() {
     if (httpreq.readyState == 4 && httpreq.status == 200) {
@@ -63,7 +63,7 @@ function UpdateActiveLocation(store, field, value) {
   Reflect.set(l, field, value);
   state.locations[state.active] = l;
 
-  this.SaveActiveLocation(store);
+  SaveActiveLocation(store);
 }
 
 function Mothership(state, action) {

diff --git a/frontend/test/components/primaryActions.spec.jsx b/frontend/test/components/primaryActions.spec.jsx
@@ -31,6 +31,22 @@ const mockStore = configureStore();
 
 describe('components', () => {
   describe('PrimaryActions', () => {
+  	it('should display a settings button', () => {
+  		var s = {locations:[{id:2, uuid:'800fd548-2d2b-4185-885d-6323ccbe88a0', port:8080, authorised:true, name:'NYPL', state:'idle'}], active:0};
+
+		var c = mount(<Provider store={mockStore(s)}><PrimaryActions /></Provider>);
+		expect(c.find('#settings').length).toEqual(1);
+  	})
+
+  	it('settings button should dispatch an edit settings action on click', () => {
+		var s = {locations:[{id:2, uuid:'800fd548-2d2b-4185-885d-6323ccbe88a0', port:8080, authorised:true, name:'NYPL', state:'idle'}], active:0};
+		var st = mockStore(s);
+		var c = mount(<Provider store={st}><PrimaryActions /></Provider>);
+
+		c.find('#settings').simulate('click');
+		expect(st.getActions()).toEqual([{type:'EDIT_SETTINGS'}])
+  	})
+
 	it('should provide an activate/deactivate button based on authorised state', () => {
 		var s = {locations:[{id:2, uuid:'800fd548-2d2b-4185-885d-6323ccbe88a0', port:8080, authorised:true, name:'NYPL', state:'idle'}], active:0};