Skip to content
This repository has been archived by the owner on Oct 11, 2023. It is now read-only.

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
yingzhao-1 committed Apr 18, 2018
1 parent 72b2d2e commit 54a2f75
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/components/Incident/IncidentSummary.js
Expand Up @@ -57,7 +57,7 @@ const BasicInfoColumn = (ticketSystem, ticket) => [
: null
]

const ticketStatus = (key, status) =>(
const ticketStatus = (key, status) => (
<span key={key}>
{' | '}
<span style={status === 'Active' ? styles.activeStatus : styles.inactiveStatus}>
Expand Down
12 changes: 6 additions & 6 deletions src/components/Timeline/Filter/ApplyFilterOnMount.js
Expand Up @@ -7,7 +7,7 @@ import { applyFilter } from 'actions/filterActions'

export class ApplyFilterOnMount extends Component {
static propTypes = {
filters: PropTypes.object.isRequired,
filter: PropTypes.object.isRequired,
filterPreference: PropTypes.string.isRequired,
history: PropTypes.object.isRequired,
dispatch: PropTypes.func.isRequired,
Expand All @@ -17,15 +17,15 @@ export class ApplyFilterOnMount extends Component {
}

componentDidMount () {
const { dispatch, history, filters, filterPreference, incidentId, applyFilter } = this.props
const filterWithIncidentId = Object.assign({}, filters, {incidentId})
const { dispatch, history, filter, filterPreference, incidentId, applyFilter } = this.props
const filterWithIncidentId = Object.assign({}, filter, {incidentId})
dispatch(applyFilter(history, filterWithIncidentId, filterPreference))
}

componentDidUpdate (oldProps) {
const { dispatch, history, filters, filterPreference, incidentId, applyFilter } = this.props
const { dispatch, history, filter, filterPreference, incidentId, applyFilter } = this.props
if (oldProps.incidentId !== incidentId) {
const filterWithIncidentId = Object.assign({}, filters, {incidentId})
const filterWithIncidentId = Object.assign({}, filter, {incidentId})
dispatch(applyFilter(history, filterWithIncidentId, filterPreference))
}
}
Expand All @@ -36,7 +36,7 @@ export class ApplyFilterOnMount extends Component {
}

export const mapStateToApplyFilterProps = (state, ownProps) => ({
filters: state.events.filter,
filter: state.events.filter,
filterPreference: state.signalR.filterPreferences.eventFilterType,
applyFilter,
...ownProps
Expand Down
2 changes: 1 addition & 1 deletion test/components/Timeline/Filter/ApplyFilterOnMountTest.js
Expand Up @@ -106,7 +106,7 @@ describe('Apply Filter On Mount', function () {
const result = mapStateToApplyFilterProps(mockState, testOwnProps)

it('Should return filters from state', function () {
expect(result.filters).to.equal('expectedFilter')
expect(result.filter).to.equal('expectedFilter')
})

it('Should return filterPreference from state', function () {
Expand Down

0 comments on commit 54a2f75

Please sign in to comment.