Fix range error in queries

specs/metric_find_query.jest.ts

@@ -10,9 +10,9 @@ describe('metric find query', () => {
 
     it('returns a measurement query for measurements()', () => {
       const query = ' measurements(mydb) ';
-      const result = expandMacros(query).replace(/\s/g, '');
+      const result = expandMacros(query);
       expect(result).toBe(
-        'from(bucket:"mydb")|>range($range)|>group(columns:["_measurement"])|>distinct(column:"_measurement")'
+        'import "influxdata/influxdb/v1" v1.measurements(bucket: "mydb")'
       );
     });
 

src/editor/FluxQueryField.tsx

@@ -29,11 +29,11 @@ const DEFAULT_DATABASE = 'telegraf';
 function expandQuery(bucket, measurement, field) {
   if (field) {
     return (
-      `from(bucket: "${bucket}")\n` +
-      `  |> filter(fn: (r) => r["_measurement"] == "${measurement}")\n  |> filter(fn: (r) => r["_field"] == "${field}")\n  |> range($range)\n  |> limit(n: 1000)`
+      `from(bucket: "${bucket}")\n  |> range($range)\n` +
+      `  |> filter(fn: (r) => r["_measurement"] == "${measurement}")\n  |> filter(fn: (r) => r["_field"] == "${field}")\n  |> aggregateWindow(every: $__interval, fn: last)`
     );
   }
-  return `from(bucket: "${bucket}")\n  |> filter(fn: (r) => r["_measurement"] == "${measurement}")\n  |> range($range)\n  |> limit(n: 1000)`;
+  return `from(bucket: "${bucket}")\n  |> range($range)\n  |> filter(fn: (r) => r["_measurement"] == "${measurement}")\n  |> aggregateWindow(every: $__interval, fn: last)`;
 }
 
 export default class FluxQueryField extends QueryField {
@@ -126,7 +126,7 @@ export default class FluxQueryField extends QueryField {
           }
         } else if (db) {
           const measurements = this.measurements && this.measurements[db];
-          if (measurements) {
+          if (measurements && measurements.length > 0) {
             prefix = prefix.replace(/\w*\.\./g, '');
             typeaheadContext = 'context-measurements';
             suggestionGroups.push({ label: 'Measurements', items: measurements });

src/metric_find_query.ts

@@ -16,10 +16,7 @@ export default function expandMacros(query) {
   const measurementsQuery = query.match(MEASUREMENTS_REGEXP);
   if (measurementsQuery) {
     const database = measurementsQuery[1];
-    return `from(bucket:"${database}")
-    |> range($range)
-    |> group(columns:["_measurement"])
-    |> distinct(column:"_measurement")`;
+    return `import "influxdata/influxdb/v1" v1.measurements(bucket: "${database}")`;
   }
 
   const tagsQuery = query.match(TAGS_REGEXP);