Skip to content

Commit

Permalink
Merge pull request #549 from kanaabe/tracking-qa
Browse files Browse the repository at this point in the history
@yuki24 => Update context_module on genes
  • Loading branch information
yuki24 authored Feb 23, 2018
2 parents bb86813 + b15d63a commit 0b7d884
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class GeneSearchResultsContent extends React.Component<RelayProps, null> {
action: "Followed Gene",
entity_id: gene._id,
entity_slug: gene.id,
context_module: "gene search",
context_module: "onboarding search",
})
}

Expand Down
2 changes: 1 addition & 1 deletion src/Components/Onboarding/Steps/Genes/SuggestedGenes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class SuggestedGenesContent extends React.Component<Props, null> {
action: "Followed Gene",
entity_id: gene._id,
entity_slug: gene.id,
context_module: "gene recommended",
context_module: "onboarding recommended",
})
}

Expand Down
79 changes: 58 additions & 21 deletions src/Components/Onboarding/Wizard.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
import React from "react"
import { Redirect, Route } from 'react-router'
import { Redirect, Route } from "react-router"

import Events from "../../Utils/Events"
import { track } from "../../Utils/track"
import { ProgressIndicator } from "./ProgressIndicator"

import Artists from './Steps/Artists'
import Artists from "./Steps/Artists"
import Budget, { BudgetComponent } from "./Steps/Budget"
import CollectorIntent, { CollectorIntentComponent } from "./Steps/CollectorIntent"
import Genes from './Steps/Genes'
import CollectorIntent, {
CollectorIntentComponent,
} from "./Steps/CollectorIntent"
import Genes from "./Steps/Genes"

const STEPS = [
`/personalize/${CollectorIntentComponent.slug}`,
`/personalize/${Artists.slug}`,
`/personalize/${Genes.slug}`,
`/personalize/${BudgetComponent.slug}`
`/personalize/${BudgetComponent.slug}`,
]

export interface Props {
Expand Down Expand Up @@ -51,24 +53,59 @@ export class Wizard extends React.Component<Props, State> {
render() {
return (
<div>
<Route path='/personalize/*' render={() =>
<ProgressIndicator percentComplete={ this.state.finished ? 1 : STEPS.indexOf(location.pathname) / STEPS.length } />
} />
<Route
path="/personalize/*"
render={() => (
<ProgressIndicator
percentComplete={
this.state.finished
? 1
: STEPS.indexOf(location.pathname) / STEPS.length
}
/>
)}
/>

<Route path={`/personalize/${CollectorIntentComponent.slug}`} render={props =>
<CollectorIntent {...props} onNextButtonPressed={(increaseBy = 1) => this.onNextButtonPressed(increaseBy, props.history)} />
} />
<Route path={`/personalize/${Artists.slug}`} render={props =>
<Artists {...props} onNextButtonPressed={(increaseBy = 1) => this.onNextButtonPressed(increaseBy, props.history)} />
} />
<Route path={`/personalize/${Genes.slug}`} render={props =>
<Genes {...props} onNextButtonPressed={(increaseBy = 1) => this.onNextButtonPressed(increaseBy, props.history)} />
} />
<Route path={`/personalize/${BudgetComponent.slug}`} render={props =>
<Budget {...props} onNextButtonPressed={() => this.onFinish()} />
} />
<Route
path={`/personalize/${CollectorIntentComponent.slug}`}
render={props => (
<CollectorIntent
{...props}
onNextButtonPressed={(increaseBy = 1) =>
this.onNextButtonPressed(increaseBy, props.history)}
/>
)}
/>
<Route
path={`/personalize/${Artists.slug}`}
render={props => (
<Artists
{...props}
onNextButtonPressed={(increaseBy = 1) =>
this.onNextButtonPressed(increaseBy, props.history)}
/>
)}
/>
<Route
path={`/personalize/${Genes.slug}`}
render={props => (
<Genes
{...props}
onNextButtonPressed={(increaseBy = 1) =>
this.onNextButtonPressed(increaseBy, props.history)}
/>
)}
/>
<Route
path={`/personalize/${BudgetComponent.slug}`}
render={props => (
<Budget {...props} onNextButtonPressed={() => this.onFinish()} />
)}
/>

{new RegExp("/personalize(/*)$").exec(location.pathname) && <Redirect to={`/personalize/${CollectorIntentComponent.slug}`} />}
{new RegExp("/personalize(/*)$").exec(location.pathname) && (
<Redirect to={`/personalize/${CollectorIntentComponent.slug}`} />
)}
</div>
)
}
Expand Down
19 changes: 9 additions & 10 deletions src/Components/Onboarding/__stories__/Wizard.story.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ import React from "react"
import { ContextProvider } from "../../Artsy"
import { Wizard } from "../Wizard"

storiesOf("Onboarding", module)
.add("Wizard", () => {
return (
<div>
<ContextProvider>
<Wizard />
</ContextProvider>
</div>
)
})
storiesOf("Onboarding", module).add("Wizard", () => {
return (
<div>
<ContextProvider>
<Wizard />
</ContextProvider>
</div>
)
})

0 comments on commit 0b7d884

Please sign in to comment.