Merge pull request #154 from GeoNode/fix-save

Fix add layer and save not showing up

Author: milafrerichs

src/components/geonode.jsx

@@ -106,6 +106,21 @@ class GeoNodeViewer extends React.Component {
       errorOpen: false
     });
   }
+  _createLayerList() {
+    let layerList;
+    if(this._local) {
+      layerList = {
+        sources: [{title: this._local.title, url: this._local.url, type: 'WMS'}],
+        allowUserInput: true
+      };
+    } else {
+      layerList = {
+        sources: [{title: 'Local Geoserver', url: this.props.server+'/geoserver/wms', type: 'WMS'}],
+        allowUserInput: true
+      };
+    }
+    return layerList;
+  }
   render() {
     var error;
     if (this.state.errors.length > 0) {
@@ -121,11 +136,8 @@ class GeoNodeViewer extends React.Component {
       />);
     }
     let layerList, save, mapUrl;
-    if(this.edit && this._local) {
-      layerList = {
-        sources: [{title: this._local.title, url: this._local.url, type: 'WMS'}],
-        allowUserInput: true
-      };
+    if(this.edit) {
+      layerList = this._createLayerList();
       if(this.props.server) {
         save = (<div id='save-button' className='geonode-save'><Save map={map} /></div>);
         mapUrl = (<MapUrlLink />);

tests/components/geonodeviewer.test.js

@@ -5,6 +5,9 @@ import {assert} from 'chai';
 import ol from 'openlayers';
 
 import ReactTestUtils from 'react-addons-test-utils';
+import {shallowWithIntl} from '../testhelper';
+
+import LayerList from 'boundless-sdk/components/LayerList';
 
 import GeoNodeViewer from '../../src/components/geonode';
 import rendererWithIntl from '../../helper/renderWithIntl.js';
@@ -90,15 +93,44 @@ describe('GeoNodeViewer', () => {
     });
     describe('composer', () => {
       it('can remove layers', () => {
-        const geonodeviewer = ReactTestUtils.renderIntoDocument(<IntlProvider locale="en"><GeoNodeViewer mode='composer' addLayerSources={layerSources} config={config}/></IntlProvider>);
-        var contents = ReactTestUtils.scryRenderedDOMComponentsWithClass(geonodeviewer, 'layer-list-item-remove');
-				assert.equal(contents.length, 1);
+        const wrapper = shallowWithIntl(<GeoNodeViewer mode='composer' config={config}/>, {});
+        assert.equal(wrapper.find(LayerList).prop('allowRemove'),true);
       });
       it('can add layers', () => {
-        const geonodeviewer = ReactTestUtils.renderIntoDocument(<IntlProvider locale="en"><GeoNodeViewer mode='composer' addLayerSources={layerSources} config={config}/></IntlProvider>);
+        const geonodeviewer = ReactTestUtils.renderIntoDocument(<IntlProvider locale="en"><GeoNodeViewer mode='composer' config={config}/></IntlProvider>);
         var contents = ReactTestUtils.scryRenderedDOMComponentsWithClass(geonodeviewer, 'layer-list-add');
 				assert.equal(contents.length, 1);
       });
+      it('does allow styling of layers', () => {
+        const wrapper = shallowWithIntl(<GeoNodeViewer mode='composer' config={config}/>, {});
+        assert.equal(wrapper.find(LayerList).prop('allowStyling'),true);
+      });
+      it('has addLayer list and uses server correctly', () => {
+        const layerList = {
+          sources: [{title: 'Local Geoserver', url: 'http://geonode.org/geoserver/wms', type: 'WMS'}],
+          allowUserInput: true
+        };
+        const wrapper = shallowWithIntl(<GeoNodeViewer mode='composer' server='http://geonode.org' config={config}/>, {});
+        assert.deepEqual(wrapper.find(LayerList).prop('addLayer'),layerList);
+      });
+      it('as addLayer list', () => {
+        const layerList = {
+          sources: [{title: 'Local Geoserver', url: 'undefined/geoserver/wms', type: 'WMS'}],
+          allowUserInput: true
+        };
+        const wrapper = shallowWithIntl(<GeoNodeViewer mode='composer' config={config}/>, {});
+        assert.deepEqual(wrapper.find(LayerList).prop('addLayer'),layerList);
+      });
+      it('as addLayer list', () => {
+        const sources = {'0': { ptype: 'gxp_wmscsource', url: 'http://geonode.org?access_token=1', title: 'test'}}
+        const baseUrl = 'http://geonode.org'
+        const layerList = {
+          sources: [{title: 'test', url: 'http://geonode.org?access_token=1', type: 'WMS'}],
+          allowUserInput: true
+        };
+        const wrapper = shallowWithIntl(<GeoNodeViewer mode='composer' sources={sources} baseUrl={baseUrl} config={config}/>, {});
+        assert.deepEqual(wrapper.find(LayerList).prop('addLayer'),layerList);
+      });
     });
   });
 });