Permalink
Browse files

Merge branch 'master' of bitbucket.org:balize/openex-frontend

  • Loading branch information...
2 parents 03cc42c + 6bdeb11 commit a50453e7d3ba6590fbcb97dea9b79ed9815128d8 @richard-julien richard-julien committed Jan 11, 2017
Showing with 4 additions and 4 deletions.
  1. +4 −4 src/containers/authenticated/exercise/execution/Index.js
@@ -307,8 +307,8 @@ const filterInjectsPending = (state, ownProps) => {
const exerciseId = ownProps.params.exerciseId
let injectsFilterAndSorting = R.pipe(
R.values,
- R.sort((a, b) => timeDiff(a.inject_date, b.inject_date)),
- R.filter(n => n.inject_exercise === exerciseId && n.inject_status.status_name === 'PENDING')
+ R.filter(n => n.inject_exercise === exerciseId && n.inject_status.status_name === 'PENDING'),
+ R.sort((a, b) => timeDiff(a.inject_date, b.inject_date))
)
return injectsFilterAndSorting(injects)
}
@@ -326,12 +326,12 @@ const filterInjectsProcessed = (state, ownProps) => {
const exerciseId = ownProps.params.exerciseId
let injectsFilterAndSorting = R.pipe(
R.values,
- R.sort((a, b) => a.inject_date < b.inject_date),
R.filter(n => n.inject_exercise === exerciseId && (
n.inject_status.status_name === 'SUCCESS' ||
n.inject_status.status_name === 'ERROR' ||
n.inject_status.status_name === 'PARTIAL')
- )
+ ),
+ R.sort((a, b) => a.inject_date > b.inject_date),
)
return injectsFilterAndSorting(injects)
}

0 comments on commit a50453e

Please sign in to comment.