this.props.onHighlight(annotation.properties.id)} onMouseOut={this.props.onCleanHighlight} onClick={() => this.props.onDetail(annotation.properties.id)}>
+ return (
this.props.onHighlight(annotation.properties.id)} onMouseOut={this.props.onCleanHighlight} onClick={() => this.props.onDetail(annotation.properties.id)}>
{this.renderThumbnail(annotation.style)}
{this.getConfig().fields.map(f => this.renderField(f, annotation))}
);
diff --git a/web/client/components/mapcontrols/annotations/__tests__/Annotations-test.jsx b/web/client/components/mapcontrols/annotations/__tests__/Annotations-test.jsx
index d295614bad..dc894e5885 100644
--- a/web/client/components/mapcontrols/annotations/__tests__/Annotations-test.jsx
+++ b/web/client/components/mapcontrols/annotations/__tests__/Annotations-test.jsx
@@ -186,4 +186,44 @@ describe("test the Annotations Panel", () => {
expect(TestUtils.scryRenderedDOMComponentsWithClass(annotations, "mapstore-annotations-panel-card").length).toBe(0);
expect(TestUtils.scryRenderedDOMComponentsWithClass(annotations, "myeditor").length).toBe(1);
});
+
+ it('test rendering custom class', () => {
+ const annotationsList = [{
+ properties: {
+ title: 'a',
+ description: 'b'
+ },
+ style: {
+ iconShape: 'square',
+ iconColor: 'blue'
+ }
+ }, {
+ properties: {
+ external: true,
+ title: 'c',
+ description: 'd'
+ },
+ style: {
+ iconShape: 'square',
+ iconColor: 'blue'
+ }
+ }];
+
+ const classNameSelector = (annotation) => {
+ if (annotation && annotation.properties && annotation.properties.external) {
+ return 'external';
+ }
+ return '';
+ };
+
+ const annotations = ReactDOM.render(
, document.getElementById("container"));
+
+ expect(annotations).toExist();
+
+ const cards = TestUtils.scryRenderedDOMComponentsWithClass(annotations, "mapstore-annotations-panel-card");
+ expect(cards.length).toBe(2);
+
+ const cardsExternal = TestUtils.scryRenderedDOMComponentsWithClass(annotations, "mapstore-annotations-panel-card external");
+ expect(cardsExternal.length).toBe(1);
+ });
});
diff --git a/web/client/components/shapefile/SelectShape.jsx b/web/client/components/shapefile/SelectShape.jsx
index 635a244cac..5939003ea2 100644
--- a/web/client/components/shapefile/SelectShape.jsx
+++ b/web/client/components/shapefile/SelectShape.jsx
@@ -13,6 +13,10 @@ const Spinner = require('react-spinkit');
const LocaleUtils = require('../../utils/LocaleUtils');
+const JSZip = require('jszip');
+const FileUtils = require('../../utils/FileUtils');
+const {Promise} = require('es6-promise');
+
class SelectShape extends React.Component {
static propTypes = {
text: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
@@ -43,17 +47,32 @@ class SelectShape extends React.Component {
);
}
+ tryUnzip = (file) => {
+ return FileUtils.readZip(file).then((buffer) => {
+ return new JSZip(buffer);
+ });
+ };
+
+ isZip = (file) => {
+ return new Promise((resolve, reject) => {
+ if (file.type === 'application/zip' || file.type === 'application/x-zip-compressed') {
+ resolve();
+ } else {
+ this.tryUnzip(file).then(resolve).catch(reject);
+ }
+ });
+ };
+
checkfile = (files) => {
- const allZip = files.filter((file) => { return file.type !== 'application/zip' && file.type !== 'application/x-zip-compressed'; }).length === 0;
- if (allZip) {
+ Promise.all(files.map(file => this.isZip(file))).then(() => {
if (this.props.error) {
this.props.onShapeError(null);
}
this.props.onShapeChoosen(files);
- } else {
+ }).catch(() => {
const error = LocaleUtils.getMessageById(this.context.messages, this.props.errorMessage);
this.props.onShapeError(error);
- }
+ });
};
}
diff --git a/web/client/components/shapefile/__tests__/SelectShape-test.jsx b/web/client/components/shapefile/__tests__/SelectShape-test.jsx
index f3ed01520a..3b68fa88a5 100644
--- a/web/client/components/shapefile/__tests__/SelectShape-test.jsx
+++ b/web/client/components/shapefile/__tests__/SelectShape-test.jsx
@@ -2,6 +2,7 @@ const expect = require('expect');
const React = require('react');
const ReactDOM = require('react-dom');
const SelectShape = require('../SelectShape');
+const b64toBlob = require('b64-to-blob');
const TestUtils = require('react-dom/test-utils');
@@ -43,10 +44,9 @@ describe("Test the select shapefile component", () => {
expect(dom.innerHTML.indexOf('TEST') !== -1).toBe(true);
});
- it('upload file', () => {
- let dropped = false;
+ it('upload file', (done) => {
const handler = () => {
- dropped = true;
+ done();
};
const cmp = ReactDOM.render(
, document.getElementById("container"));
expect(cmp).toExist();
@@ -59,13 +59,24 @@ describe("Test the select shapefile component", () => {
type: 'application/zip'
}];
TestUtils.Simulate.drop(content, { dataTransfer: { files } });
- expect(dropped).toBe(true);
});
- it('upload wrong file', () => {
- let error = false;
+ it('upload wrong mime, right file', (done) => {
const handler = () => {
- error = true;
+ done();
+ };
+ const cmp = ReactDOM.render(, document.getElementById("container"));
+ expect(cmp).toExist();
+ const dom = ReactDOM.findDOMNode(cmp);
+ expect(dom.getElementsByTagName('input').length).toBe(1);
+ const content = TestUtils.findRenderedDOMComponentWithClass(cmp, 'dropzone-content');
+ const files = [b64toBlob('UEsDBAoAAAAAACGPaktDvrfoAQAAAAEAAAAKAAAAc2FtcGxlLnR4dGFQSwECPwAKAAAAAAAhj2pLQ7636AEAAAABAAAACgAkAAAAAAAAACAAAAAAAAAAc2FtcGxlLnR4dAoAIAAAAAAAAQAYAGILh+1EWtMBy3f86URa0wHLd/zpRFrTAVBLBQYAAAAAAQABAFwAAAApAAAAAAA=', 'application/pdf')];
+ TestUtils.Simulate.drop(content, { dataTransfer: { files } });
+ });
+
+ it('upload wrong file', (done) => {
+ const handler = () => {
+ done();
};
const cmp = ReactDOM.render(, document.getElementById("container"));
expect(cmp).toExist();
@@ -78,6 +89,5 @@ describe("Test the select shapefile component", () => {
type: 'application/pdf'
}];
TestUtils.Simulate.drop(content, { dataTransfer: { files } });
- expect(error).toBe(true);
});
});
diff --git a/web/client/plugins/TOC.jsx b/web/client/plugins/TOC.jsx
index 741cf72202..d7d9ed9696 100644
--- a/web/client/plugins/TOC.jsx
+++ b/web/client/plugins/TOC.jsx
@@ -12,13 +12,15 @@ const {createSelector} = require('reselect');
const {Glyphicon} = require('react-bootstrap');
const {changeLayerProperties, changeGroupProperties, toggleNode, contextNode,
- sortNode, showSettings, hideSettings, updateSettings, updateNode, removeNode, browseData, selectNode, filterLayers, refreshLayerVersion} = require('../actions/layers');
+ sortNode, showSettings, hideSettings, updateSettings, updateNode, removeNode,
+ browseData, selectNode, filterLayers, refreshLayerVersion} = require('../actions/layers');
const {getLayerCapabilities} = require('../actions/layerCapabilities');
const {zoomToExtent} = require('../actions/map');
const {groupsSelector, layersSelector, selectedNodesSelector, layerFilterSelector, layerSettingSelector} = require('../selectors/layers');
const {mapSelector, mapNameSelector} = require('../selectors/map');
const {currentLocaleSelector} = require("../selectors/locale");
const {widgetBuilderAvailable} = require('../selectors/controls');
+const {generalInfoFormatSelector} = require("../selectors/mapInfo");
const LayersUtils = require('../utils/LayersUtils');
const mapUtils = require('../utils/MapUtils');
@@ -71,8 +73,9 @@ const tocSelector = createSelector(
layersSelector,
mapNameSelector,
activeSelector,
- widgetBuilderAvailable
- ], (enabled, groups, settings, map, currentLocale, selectedNodes, filterText, layers, mapName, catalogActive, activateWidgetTool) => ({
+ widgetBuilderAvailable,
+ generalInfoFormatSelector
+ ], (enabled, groups, settings, map, currentLocale, selectedNodes, filterText, layers, mapName, catalogActive, activateWidgetTool, generalInfoFormat) => ({
enabled,
groups,
settings,
@@ -84,6 +87,7 @@ const tocSelector = createSelector(
currentLocale,
selectedNodes,
filterText,
+ generalInfoFormat,
selectedLayers: layers.filter((l) => head(selectedNodes.filter(s => s === l.id))),
noFilterResults: layers.filter((l) => filterLayersByTitle(l, filterText, currentLocale)).length === 0,
selectedGroups: selectedNodes.map(n => LayersUtils.getNode(groups, n)).filter(n => n && n.nodes),
@@ -163,6 +167,7 @@ class LayerTree extends React.Component {
currentLocale: PropTypes.string,
onFilter: PropTypes.func,
filterText: PropTypes.string,
+ generalInfoFormat: PropTypes.string,
selectedLayers: PropTypes.array,
selectedGroups: PropTypes.array,
mapName: PropTypes.string,
@@ -295,6 +300,7 @@ class LayerTree extends React.Component {
groups={this.props.groups}
selectedLayers={this.props.selectedLayers}
selectedGroups={this.props.selectedGroups}
+ generalInfoFormat={this.props.generalInfoFormat}
settings={this.props.settings}
activateTool={{
activateToolsContainer: this.props.activateToolsContainer,
diff --git a/web/client/selectors/__tests__/mapinfo-test.js b/web/client/selectors/__tests__/mapinfo-test.js
new file mode 100644
index 0000000000..fa67ace5a3
--- /dev/null
+++ b/web/client/selectors/__tests__/mapinfo-test.js
@@ -0,0 +1,30 @@
+/*
+* Copyright 2017, GeoSolutions Sas.
+* All rights reserved.
+*
+* This source code is licensed under the BSD-style license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+
+const expect = require('expect');
+const {
+ generalInfoFormatSelector
+} = require('../mapinfo');
+
+describe('Test mapinfo', () => {
+ it('test generalInfoFormatSelector default value', () => {
+ const mapinfo = generalInfoFormatSelector({});
+ expect(mapinfo).toBe("text/plain");
+ });
+ it('test generalInfoFormatSelector infoFormat: undefined', () => {
+ const mapinfo = generalInfoFormatSelector({mapInfo: {infoFormat: undefined}});
+ expect(mapinfo).toBe("text/plain");
+ });
+ it('test generalInfoFormatSelector ', () => {
+ const mapinfo = generalInfoFormatSelector({mapInfo: {infoFormat: "text/html"}});
+
+ expect(mapinfo).toExist();
+ expect(mapinfo).toBe("text/html");
+ });
+});
diff --git a/web/client/selectors/mapinfo.js b/web/client/selectors/mapinfo.js
new file mode 100644
index 0000000000..3a1916a421
--- /dev/null
+++ b/web/client/selectors/mapinfo.js
@@ -0,0 +1,27 @@
+/*
+* Copyright 2017, GeoSolutions Sas.
+* All rights reserved.
+*
+* This source code is licensed under the BSD-style license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+const {get} = require('lodash');
+/**
+ * selects mapinfo state
+ * @name mapinfo
+ * @memberof selectors
+ * @static
+ */
+
+/**
+ * selects generalInfoFormat from state
+ * @memberof selectors.mapinfo
+ * @param {object} state the state
+ * @return {string} the maptype in the state
+ */
+const generalInfoFormatSelector = (state) => get(state, "mapInfo.infoFormat", "text/plain");
+
+module.exports = {
+ generalInfoFormatSelector
+};
diff --git a/web/client/utils/FileUtils.js b/web/client/utils/FileUtils.js
index 8489b7ee01..b6a6a60601 100644
--- a/web/client/utils/FileUtils.js
+++ b/web/client/utils/FileUtils.js
@@ -9,6 +9,7 @@
const FileSaver = require('file-saver');
const toBlob = require('canvas-to-blob');
const shp = require('shpjs');
+const {Promise} = require('es6-promise');
const FileUtils = {
download: function(blob, name, mimetype) {
diff --git a/web/client/utils/MapInfoUtils.js b/web/client/utils/MapInfoUtils.js
index df671d4c56..bd37b7e4b9 100644
--- a/web/client/utils/MapInfoUtils.js
+++ b/web/client/utils/MapInfoUtils.js
@@ -31,6 +31,12 @@ const MapInfoUtils = {
return prev;
}, {});
},
+ /**
+ * @return the label of an inputformat given the value
+ */
+ getLabelFromValue(value) {
+ return MapInfoUtils.getAvailableInfoFormatLabels().filter(info => INFO_FORMATS[info] === value)[0] || "TEXT";
+ },
/**
* @return like getAvailableInfoFormat but return an array filled with the keys
*/
diff --git a/web/client/utils/__tests__/MapInfoUtils-test.js b/web/client/utils/__tests__/MapInfoUtils-test.js
index a154590a00..d2483a0432 100644
--- a/web/client/utils/__tests__/MapInfoUtils-test.js
+++ b/web/client/utils/__tests__/MapInfoUtils-test.js
@@ -16,7 +16,8 @@ var {
buildIdentifyRequest,
getValidator,
getViewer,
- setViewer
+ setViewer,
+ getLabelFromValue
} = require('../MapInfoUtils');
const CoordinatesUtils = require('../CoordinatesUtils');
@@ -329,4 +330,16 @@ describe('MapInfoUtils', () => {
let validResponses = validator.getValidResponses(response);
expect(validResponses.length).toBe(1);
});
+ it('get the label given the text/plain value', () => {
+ let label = getLabelFromValue("text/plain");
+ expect(label).toBe("TEXT");
+ });
+ it('get the label given the text/html value', () => {
+ let label = getLabelFromValue("text/html");
+ expect(label).toBe("HTML");
+ });
+ it('get the default label given the wrong value', () => {
+ let label = getLabelFromValue("text_or_something_else");
+ expect(label).toBe("TEXT");
+ });
});