From 4d1a53c20f1abfef89cd554b2e4f4a13d7b76685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 13 Sep 2017 19:27:25 +0200 Subject: [PATCH] Use string templates to build error message --- lib/cartodb/models/dataview/aggregation.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js index b2cfd212..71394211 100644 --- a/lib/cartodb/models/dataview/aggregation.js +++ b/lib/cartodb/models/dataview/aggregation.js @@ -153,24 +153,22 @@ const TYPE = 'aggregation'; */ function Aggregation(query, options = {}, queries = {}) { if (typeof options.column !== 'string') { - throw new Error('Aggregation expects `column` in widget options'); + throw new Error(`Aggregation expects 'column' in widget options`); } if (typeof options.aggregation !== 'string') { - throw new Error('Aggregation expects `aggregation` operation in widget options'); + throw new Error(`Aggregation expects 'aggregation' operation in widget options`); } if (!VALID_OPERATIONS[options.aggregation]) { - throw new Error("Aggregation does not support '" + options.aggregation + "' operation"); + throw new Error(`Aggregation does not support '${options.aggregation}' operation`); } var requiredOptions = VALID_OPERATIONS[options.aggregation]; var missingOptions = requiredOptions.filter(requiredOption => !options.hasOwnProperty(requiredOption)); if (missingOptions.length > 0) { - throw new Error( - "Aggregation '" + options.aggregation + "' is missing some options: " + missingOptions.join(',') - ); + throw new Error(`Aggregation '${options.aggregation}' is missing some options: ${missingOptions.join(',')}`); } BaseWidget.apply(this); @@ -305,7 +303,6 @@ Aggregation.prototype.format = function(result) { var maxValue = 0; var categoriesCount = 0; - if (result.rows.length) { var firstRow = result.rows[0]; count = firstRow.count;