From 8ff8c0ba841caf8217d95e3c18aa5bc1ef918533 Mon Sep 17 00:00:00 2001
From: Iris Scholten <ischolten.is@gmail.com>
Date: Tue, 22 Jan 2019 09:33:01 -0800
Subject: [PATCH] fix(ui/dataLoading): Ensure that a bucket gets passed into
 the datalistening query

---
 ui/src/dataLoaders/components/StepSwitcher.tsx         |  1 +
 .../components/verifyStep/VerifyDataStep.test.tsx      |  1 +
 .../components/verifyStep/VerifyDataStep.tsx           | 10 ++++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ui/src/dataLoaders/components/StepSwitcher.tsx b/ui/src/dataLoaders/components/StepSwitcher.tsx
index dbaa88f03f..95f332b906 100644
--- a/ui/src/dataLoaders/components/StepSwitcher.tsx
+++ b/ui/src/dataLoaders/components/StepSwitcher.tsx
@@ -114,6 +114,7 @@ class StepSwitcher extends PureComponent<Props> {
             {...onboardingStepProps}
             {...dataLoaders}
             bucket={bucketName}
+            selectedBucket={selectedBucket}
             username={username}
             org={org}
             onSaveTelegrafConfig={onSaveTelegrafConfig}
diff --git a/ui/src/onboarding/components/verifyStep/VerifyDataStep.test.tsx b/ui/src/onboarding/components/verifyStep/VerifyDataStep.test.tsx
index d153232d84..f76f695e72 100644
--- a/ui/src/onboarding/components/verifyStep/VerifyDataStep.test.tsx
+++ b/ui/src/onboarding/components/verifyStep/VerifyDataStep.test.tsx
@@ -31,6 +31,7 @@ const setup = (override = {}) => {
     username: 'user',
     org: '',
     notify: jest.fn(),
+    selectedBucket: '',
     ...override,
   }
 
diff --git a/ui/src/onboarding/components/verifyStep/VerifyDataStep.tsx b/ui/src/onboarding/components/verifyStep/VerifyDataStep.tsx
index 7b2cac99f7..903d039bb1 100644
--- a/ui/src/onboarding/components/verifyStep/VerifyDataStep.tsx
+++ b/ui/src/onboarding/components/verifyStep/VerifyDataStep.tsx
@@ -35,6 +35,7 @@ export interface OwnProps extends DataLoaderStepProps {
   bucket: string
   username: string
   org: string
+  selectedBucket: string
 }
 
 interface StateProps {
@@ -57,7 +58,6 @@ export class VerifyDataStep extends PureComponent<Props> {
 
   public render() {
     const {
-      bucket,
       username,
       telegrafConfigID,
       type,
@@ -80,7 +80,7 @@ export class VerifyDataStep extends PureComponent<Props> {
                   telegrafConfigID={telegrafConfigID}
                   onSaveTelegrafConfig={onSaveTelegrafConfig}
                   org={org}
-                  bucket={bucket}
+                  bucket={this.bucket}
                   username={username}
                   onDecrementCurrentStep={onDecrementCurrentStepIndex}
                   lpStatus={lpStatus}
@@ -97,6 +97,12 @@ export class VerifyDataStep extends PureComponent<Props> {
     )
   }
 
+  private get bucket(): string {
+    const {bucket, selectedBucket} = this.props
+
+    return selectedBucket || bucket
+  }
+
   private get previousStepName() {
     const {telegrafPlugins, type} = this.props