Merge pull request #14992 from influxdata/fix/bucket-order

fix: move system buckets to end of list
influxdata · Sep 5, 2019 · e3f31a3 · e3f31a3
2 parents cd2d9cb + a344305
commit e3f31a3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ui/src/timeMachine/actions/queryBuilder.ts b/ui/src/timeMachine/actions/queryBuilder.ts
@@ -237,11 +237,15 @@ export const loadBuckets = () => async (
   dispatch(setBuilderBucketsStatus(RemoteDataState.Loading))
 
   try {
-    const buckets = await queryBuilderFetcher.findBuckets({
+    let buckets = await queryBuilderFetcher.findBuckets({
       url: queryURL,
       orgID,
     })
 
+    const systemBuckets = buckets.filter(b => b.startsWith('_'))
+    const userBuckets = buckets.filter(b => !b.startsWith('_'))
+    buckets = [...userBuckets, ...systemBuckets]
+
     const selectedBucket = getActiveQuery(getState()).builderConfig.buckets[0]
 
     dispatch(setBuilderBuckets(buckets))

diff --git a/ui/src/timeMachine/components/QueryBuilder.tsx b/ui/src/timeMachine/components/QueryBuilder.tsx
@@ -27,7 +27,7 @@ interface StateProps {
 }
 
 interface DispatchProps {
-  onLoadBuckets: () => Promise<void>
+  onLoadBuckets: typeof loadBuckets
   onAddTagSelector: () => void
 }
 
@@ -88,7 +88,7 @@ const mstp = (state: AppState): StateProps => {
 }
 
 const mdtp = {
-  onLoadBuckets: loadBuckets as any,
+  onLoadBuckets: loadBuckets,
   onAddTagSelector: addTagSelector,
 }