From 6db7c92ded24b14c76dc3e9f5b554fae20e8f0da Mon Sep 17 00:00:00 2001 From: John Bodley <4567245+john-bodley@users.noreply.github.com> Date: Fri, 8 Nov 2019 17:56:05 -0800 Subject: [PATCH 1/2] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c481061041a5..2302e492dfec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -923,7 +923,7 @@ Note not all fields are correctly catagorized. The fields vary based on visualiz | `row_limit` | *number* | The **Row limit** widget | | `timeseries_limit_metric` | *object* | The **Sort By** widget | -Note the `metric` (or equivalent) and `timeseries_limit_metric` fields are all composed of the JSON representation of the `AdhocMetric` JavaScript type. +The `metric` (or equivalent) and `timeseries_limit_metric` fields are all composed of either metric names or the JSON representation of the `AdhocMetric` JavaScript type. The `adhoc_filters` is composed of the JSON represent of the `AdhocFilter` JavaScript type (which can comprise of columns or metrics depending on whether it is a WHERE or HAVING clause). The `all_columns_x`, `columns`, and `groupby` fields all represent column names. ### Options From 1735388735f74382f223950f380e24f498d980a4 Mon Sep 17 00:00:00 2001 From: John Bodley <4567245+john-bodley@users.noreply.github.com> Date: Fri, 8 Nov 2019 18:00:59 -0800 Subject: [PATCH 2/2] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2302e492dfec..cd617d763244 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -923,7 +923,7 @@ Note not all fields are correctly catagorized. The fields vary based on visualiz | `row_limit` | *number* | The **Row limit** widget | | `timeseries_limit_metric` | *object* | The **Sort By** widget | -The `metric` (or equivalent) and `timeseries_limit_metric` fields are all composed of either metric names or the JSON representation of the `AdhocMetric` JavaScript type. The `adhoc_filters` is composed of the JSON represent of the `AdhocFilter` JavaScript type (which can comprise of columns or metrics depending on whether it is a WHERE or HAVING clause). The `all_columns_x`, `columns`, and `groupby` fields all represent column names. +The `metric` (or equivalent) and `timeseries_limit_metric` fields are all composed of either metric names or the JSON representation of the `AdhocMetric` JavaScript type. The `adhoc_filters` is composed of the JSON represent of the `AdhocFilter` JavaScript type (which can comprise of columns or metrics depending on whether it is a WHERE or HAVING clause). The `all_columns`, `all_columns_x`, `columns`, `groupby`, and `order_by_cols` fields all represent column names. ### Options