Skip to content

Commit

Permalink
logging filters, small fix to show proper metareview status filter label
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewPhilbin committed Feb 1, 2024
1 parent 7ddf207 commit 9f2c1ff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 4 additions & 0 deletions src/components/HOCs/WithReviewTasks/WithReviewTasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,16 @@ export const WithReviewTasks = function(WrappedComponent) {
_omit(searchCriteria.filters, 'challengeName')
}

console.log('searchCriteria in WithReviewTasks updateURL', searchCriteria)
console.log('searchURL in WithReviewTasks updateURL', buildSearchURL(searchCriteria))
return buildSearchURL(searchCriteria)
}

componentDidMount() {
const searchParams = this.props.history.location.state
console.log('searchParams WithReviewTasks mount', searchParams)
const criteria = buildSearchCriteria(searchParams, this.buildDefaultCriteria(this.props))
console.log('criteria in WithReviewTasks mount', criteria)

let pageSize = _get(searchParams, 'pageSize') || criteria.pageSize || DEFAULT_PAGE_SIZE
criteria.pageSize = pageSize
Expand Down
10 changes: 3 additions & 7 deletions src/components/TaskFilters/TaskReviewStatusFilter.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ import { TaskReviewStatusWithUnset,
from '../../services/Task/TaskReview/TaskReviewStatus'
import messages from './Messages'


// const areTaskReviewStatusFiltersActive =


/**
* TaskReviewStatusFilter builds a dropdown for searching by task review status
*
Expand All @@ -33,14 +29,14 @@ export default class TaskReviewStatusFilter extends Component {
Object.keys(this.props.includeMetaReviewStatuses).length < Object.keys(TaskMetaReviewStatusWithUnset).length :
false

const areTaskReviewStatusFilersActive = this.props.metaReviewEnabled ?
const areTaskReviewStatusFiltersActive = this.props.metaReviewEnabled ?
(taskReviewStatusFiltersActive || !currentTaskMetaReviewStatuses || taskMetaReviewStatusFiltersActive) :
taskReviewStatusFiltersActive

const metaReviewStatusFilter =
!this.props.metaReviewEnabled ? {} : {
secondaryFilterLabel:
this.props.intl.formatMessage(messages.filterByReviewStatusLabel),
this.props.intl.formatMessage(messages.filterByMetaReviewStatusLabel),
secondaryFilters:
_map(TaskMetaReviewStatusWithUnset, status => (
<li key={`meta-${status}`}>
Expand All @@ -61,7 +57,7 @@ export default class TaskReviewStatusFilter extends Component {

return (
<div className='mr-flex mr-space-x-1 mr-items-center'>
{areTaskReviewStatusFilersActive && <TaskFilterIndicator />}
{areTaskReviewStatusFiltersActive && <TaskFilterIndicator />}
<FilterDropdown
title={<FormattedMessage {...messages.filterByReviewStatusLabel} />}
filters={
Expand Down

0 comments on commit 9f2c1ff

Please sign in to comment.