diff --git a/example.config.js b/example.config.js index d512e46..7758462 100644 --- a/example.config.js +++ b/example.config.js @@ -3,7 +3,6 @@ module.exports = { display_title: 'example', SERVER_ROOT: 'http://localhost:4040', EVENTS_EXT: '/api/timemap_data/export_events/deeprows', - CATEGORIES_EXT: '/api/timemap_data/export_categories/rows', ASSOCIATIONS_EXT: '/api/timemap_data/export_associations/deeprows', SOURCES_EXT: '/api/timemap_data/export_sources/deepids', SITES_EXT: '', @@ -18,7 +17,6 @@ module.exports = { }, features: { COLOR_BY_ASSOCIATION: true, - USE_CATEGORIES: true, USE_ASSOCIATIONS: true, USE_SOURCES: true, USE_COVER: false, diff --git a/package.json b/package.json index 7a14702..a80445c 100644 --- a/package.json +++ b/package.json @@ -100,6 +100,7 @@ "workbox-webpack-plugin": "5.1.4" }, "devDependencies": { + "@babel/highlight": "^7.14.5", "ava": "1.0.0-beta.8", "mocha": "^5.2.0", "node-sass": "4.13.1", diff --git a/src/common/data/copy.json b/src/common/data/copy.json index 4567108..e1bb445 100644 --- a/src/common/data/copy.json +++ b/src/common/data/copy.json @@ -145,7 +145,7 @@ "categories": "Categories", "categories_label": "Categories", "explore_by_category__title": "Explore events by category", - "explore_by_category__description": "‘Categories’ refer to the victims of a given incident.

If no categories are selected, all datapoints are displayed.", + "explore_by_category__description": "", "shapes": "Shapes", "shapes_label": "Shapes", "explore_by_shapes__title": "Explore events by shape breakdown", diff --git a/src/components/Toolbar.js b/src/components/Toolbar.js index ad9dc2a..e0b7611 100644 --- a/src/components/Toolbar.js +++ b/src/components/Toolbar.js @@ -184,6 +184,7 @@ class Toolbar extends React.Component { return (
{ this.selectTab(_selected); }} diff --git a/src/reducers/validate/validators.js b/src/reducers/validate/validators.js index 8299575..597639d 100644 --- a/src/reducers/validate/validators.js +++ b/src/reducers/validate/validators.js @@ -87,12 +87,15 @@ export function validateDomain(domain, features) { function validateArray(items, domainKey, schema) { items.forEach((item) => { + if (domainKey === "events" && item.date === "" && item.time === "") + return; validateArrayItem(item, domainKey, schema); }); } function validateObject(obj, domainKey, itemSchema) { Object.keys(obj).forEach((key) => { + if (key === "") return; const vl = obj[key]; const result = Joi.validate(vl, itemSchema); if (result.error !== null) {