Merge pull request #1643 from influxdata/onboarding/file-reorg

Change structure of onboarding component files

ui/mocks/dummyData.ts

@@ -10,7 +10,7 @@ import {
 } from 'src/types'
 import {Links} from 'src/types/v2/links'
 import {Task, TaskStatus} from 'src/types/v2/tasks'
-import {DataSource, ConfigurationState} from 'src/types/v2/dataSources'
+import {DataSource, ConfigurationState} from 'src/types/v2/dataLoaders'
 
 export const links: Links = {
   authorizations: '/api/v2/authorizations',

ui/src/onboarding/actions/dataLoaders.ts

@@ -1,5 +1,5 @@
 // Types
-import {DataSource, DataLoaderType} from 'src/types/v2/dataSources'
+import {DataSource, DataLoaderType} from 'src/types/v2/dataLoaders'
 
 export type Action =
   | SetDataLoadersType

ui/src/onboarding/components/OnboardingSideBar.tsx

@@ -16,7 +16,7 @@ import {getTelegrafConfigTOML, createTelegrafConfig} from 'src/onboarding/apis'
 
 // Types
 import {IconFont} from 'src/clockface'
-import {DataSource, ConfigurationState} from 'src/types/v2/dataSources'
+import {DataSource, ConfigurationState} from 'src/types/v2/dataLoaders'
 import {NotificationAction} from 'src/types'
 
 interface Props {

ui/src/onboarding/components/OnboardingStepSwitcher.tsx

@@ -5,8 +5,8 @@ import _ from 'lodash'
 // Components
 import InitStep from 'src/onboarding/components/InitStep'
 import AdminStep from 'src/onboarding/components/AdminStep'
-import SelectDataSourceStep from 'src/onboarding/components/SelectDataSourceStep'
-import ConfigureDataSourceStep from 'src/onboarding/components/ConfigureDataSourceStep'
+import SelectDataSourceStep from 'src/onboarding/components/selectionStep/SelectDataSourceStep'
+import ConfigureDataSourceStep from 'src/onboarding/components/configureStep/ConfigureDataSourceStep'
 import CompletionStep from 'src/onboarding/components/CompletionStep'
 import {ErrorHandling} from 'src/shared/decorators/errors'
 
@@ -19,7 +19,7 @@ import {
 
 // Types
 import {SetupParams} from 'src/onboarding/apis'
-import {DataSource, DataLoaderType} from 'src/types/v2/dataSources'
+import {DataSource, DataLoaderType} from 'src/types/v2/dataLoaders'
 import {OnboardingStepProps} from 'src/onboarding/containers/OnboardingWizard'
 
 interface Props {

ui/src/onboarding/components/configureStep/ConfigureDataSourceStep.tsx

@@ -10,11 +10,11 @@ import {
   ComponentSize,
   ComponentStatus,
 } from 'src/clockface'
-import ConfigureDataSourceSwitcher from 'src/onboarding/components/ConfigureDataSourceSwitcher'
+import ConfigureDataSourceSwitcher from 'src/onboarding/components/configureStep/ConfigureDataSourceSwitcher'
 
 // Types
 import {OnboardingStepProps} from 'src/onboarding/containers/OnboardingWizard'
-import {DataSource, DataLoaderType} from 'src/types/v2/dataSources'
+import {DataSource, DataLoaderType} from 'src/types/v2/dataLoaders'
 
 export interface Props extends OnboardingStepProps {
   dataSources: DataSource[]

ui/src/onboarding/components/configureStep/ConfigureDataSourceSwitcher.tsx

@@ -3,10 +3,10 @@ import React, {PureComponent} from 'react'
 
 // Components
 import {ErrorHandling} from 'src/shared/decorators/errors'
-import DataStreaming from 'src/onboarding/components/DataStreaming'
+import DataStreaming from 'src/onboarding/components/configureStep/streaming/DataStreaming'
 
 // Types
-import {DataSource} from 'src/types/v2/dataSources'
+import {DataSource} from 'src/types/v2/dataLoaders'
 
 export interface Props {
   dataSources: DataSource[]

ui/src/onboarding/components/configureStep/streaming/ConnectionInformation.test.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 import {shallow} from 'enzyme'
 
 // Components
-import ConnectionInformation from 'src/onboarding/components/ConnectionInformation'
+import ConnectionInformation from 'src/onboarding/components/configureStep/streaming/ConnectionInformation'
 
 // Types
 import {RemoteDataState} from 'src/types'

ui/src/onboarding/components/configureStep/streaming/DataListening.test.tsx

@@ -3,8 +3,8 @@ import React from 'react'
 import {shallow} from 'enzyme'
 
 // Components
-import DataListening from 'src/onboarding/components/DataListening'
-import ConnectionInformation from 'src/onboarding/components/ConnectionInformation'
+import DataListening from 'src/onboarding/components/configureStep/streaming/DataListening'
+import ConnectionInformation from 'src/onboarding/components/configureStep/streaming/ConnectionInformation'
 import {Button} from 'src/clockface'
 
 const setup = (override = {}) => {

ui/src/onboarding/components/configureStep/streaming/DataListening.tsx

@@ -13,7 +13,7 @@ import {
   ComponentSize,
   ComponentStatus,
 } from 'src/clockface'
-import ConnectionInformation from 'src/onboarding/components/ConnectionInformation'
+import ConnectionInformation from 'src/onboarding/components/configureStep/streaming/ConnectionInformation'
 
 // types
 import {RemoteDataState} from 'src/types'

ui/src/onboarding/components/configureStep/streaming/DataStreaming.tsx

@@ -3,10 +3,10 @@ import React, {PureComponent} from 'react'
 import _ from 'lodash'
 
 // Components
-import TelegrafInstructions from 'src/onboarding/components/TelegrafInstructions'
-import FetchConfigID from 'src/onboarding/components/FetchConfigID'
-import FetchAuthToken from 'src/onboarding/components/FetchAuthToken'
-import DataListening from 'src/onboarding/components/DataListening'
+import TelegrafInstructions from 'src/onboarding/components/configureStep/streaming/TelegrafInstructions'
+import FetchConfigID from 'src/onboarding/components/configureStep/streaming/FetchConfigID'
+import FetchAuthToken from 'src/onboarding/components/configureStep/streaming/FetchAuthToken'
+import DataListening from 'src/onboarding/components/configureStep/streaming/DataListening'
 
 // Decorator
 import {ErrorHandling} from 'src/shared/decorators/errors'

ui/src/onboarding/components/configureStep/streaming/FetchAuthToken.test.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 import {shallow} from 'enzyme'
 
 // Components
-import FetchAuthToken from 'src/onboarding/components/FetchAuthToken'
+import FetchAuthToken from 'src/onboarding/components/configureStep/streaming/FetchAuthToken'
 
 jest.mock('src/utils/api', () => require('src/onboarding/apis/mocks'))
 

ui/src/onboarding/components/configureStep/streaming/FetchConfigID.test.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 import {shallow} from 'enzyme'
 
 // Components
-import FetchConfigID from 'src/onboarding/components/FetchConfigID'
+import FetchConfigID from 'src/onboarding/components/configureStep/streaming/FetchConfigID'
 
 jest.mock('src/utils/api', () => require('src/onboarding/apis/mocks'))
 

ui/src/onboarding/components/configureStep/streaming/TelegrafInstructions.test.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import {shallow} from 'enzyme'
 
-import TelegrafInstructions from 'src/onboarding/components/TelegrafInstructions'
+import TelegrafInstructions from 'src/onboarding/components/configureStep/streaming/TelegrafInstructions'
 
 let wrapper
 

ui/src/onboarding/components/selectionStep/SelectDataSourceStep.tsx

@@ -9,8 +9,8 @@ import {
   ComponentSize,
   ComponentStatus,
 } from 'src/clockface'
-import DataSourceTypeSelector from 'src/onboarding/components/DataSourceTypeSelector'
-import StreamingDataSourceSelector from 'src/onboarding/components/StreamingDataSourcesSelector'
+import DataSourceTypeSelector from 'src/onboarding/components/selectionStep/TypeSelector'
+import StreamingDataSourceSelector from 'src/onboarding/components/selectionStep/StreamingSelector'
 
 // Types
 import {OnboardingStepProps} from 'src/onboarding/containers/OnboardingWizard'
@@ -18,7 +18,7 @@ import {
   DataSource,
   DataLoaderType,
   ConfigurationState,
-} from 'src/types/v2/dataSources'
+} from 'src/types/v2/dataLoaders'
 
 export interface Props extends OnboardingStepProps {
   bucket: string

ui/src/onboarding/components/selectionStep/StreamingSelector.tsx

@@ -7,7 +7,7 @@ import CardSelectCard from 'src/clockface/components/card_select/CardSelectCard'
 import GridSizer from 'src/clockface/components/grid_sizer/GridSizer'
 
 // Types
-import {DataSource} from 'src/types/v2/dataSources'
+import {DataSource} from 'src/types/v2/dataLoaders'
 
 export interface Props {
   dataSources: DataSource[]

ui/src/onboarding/components/selectionStep/TypeSelector.tsx

@@ -7,7 +7,7 @@ import CardSelectCard from 'src/clockface/components/card_select/CardSelectCard'
 import GridSizer from 'src/clockface/components/grid_sizer/GridSizer'
 
 // Types
-import {DataLoaderType} from 'src/types/v2/dataSources'
+import {DataLoaderType} from 'src/types/v2/dataLoaders'
 
 export interface Props {
   onSelectDataSource: (dataSource: string) => void

ui/src/onboarding/containers/OnboardingWizard.tsx

@@ -36,7 +36,7 @@ import {StepStatus} from 'src/clockface/constants/wizard'
 // Types
 import {Links} from 'src/types/v2/links'
 import {SetupParams} from 'src/onboarding/apis'
-import {DataSource, DataLoaderType} from 'src/types/v2/dataSources'
+import {DataSource, DataLoaderType} from 'src/types/v2/dataLoaders'
 import {Notification, NotificationFunc} from 'src/types'
 import {AppState} from 'src/types/v2'
 import OnboardingSideBar from 'src/onboarding/components/OnboardingSideBar'

ui/src/onboarding/reducers/dataLoaders.test.ts

@@ -11,7 +11,7 @@ import {
   removeDataSource,
 } from 'src/onboarding/actions/dataLoaders'
 
-import {DataLoaderType, ConfigurationState} from 'src/types/v2/dataSources'
+import {DataLoaderType, ConfigurationState} from 'src/types/v2/dataLoaders'
 
 describe('dataLoader reducer', () => {
   describe('if type is streaming', () => {

ui/src/onboarding/reducers/dataLoaders.ts

@@ -3,7 +3,7 @@ import {getInitialDataSources} from 'src/onboarding/utils/dataLoaders'
 
 // Types
 import {Action} from 'src/onboarding/actions/dataLoaders'
-import {DataSource, DataLoaderType} from 'src/types/v2/dataSources'
+import {DataSource, DataLoaderType} from 'src/types/v2/dataLoaders'
 
 export interface DataLoadersState {
   dataSources: DataSource[]

ui/src/onboarding/utils/dataLoaders.ts

@@ -1,5 +1,5 @@
 // Types
-import {DataLoaderType, ConfigurationState} from 'src/types/v2/dataSources'
+import {DataLoaderType, ConfigurationState} from 'src/types/v2/dataLoaders'
 
 export const getInitialDataSources = (type: DataLoaderType) => {
   if (type === DataLoaderType.Streaming) {