diff --git a/src/components/AdminPane/Manage/ViewChallengeTasks/ViewChallengeTasks.js b/src/components/AdminPane/Manage/ViewChallengeTasks/ViewChallengeTasks.js index 8ddab1595..e70adae27 100644 --- a/src/components/AdminPane/Manage/ViewChallengeTasks/ViewChallengeTasks.js +++ b/src/components/AdminPane/Manage/ViewChallengeTasks/ViewChallengeTasks.js @@ -241,6 +241,7 @@ export class ViewChallengeTasks extends Component { /> this.boundsReset = false + return (
@@ -252,12 +253,12 @@ export class ViewChallengeTasks extends Component {
-
+
-

+

-
    +
    • @@ -272,8 +273,8 @@ export class ViewChallengeTasks extends Component {
-
- {calculateTasksInChallenge(this.props) !== _get(this.props, 'taskInfo.totalCount', 0) ? clearFiltersControl : null} +
+ {clearFiltersControl}
diff --git a/src/components/Widgets/ReviewNearbyTasksWidget/ReviewNearbyTasksWidget.js b/src/components/Widgets/ReviewNearbyTasksWidget/ReviewNearbyTasksWidget.js index 79e6ce7e8..2570d16d3 100644 --- a/src/components/Widgets/ReviewNearbyTasksWidget/ReviewNearbyTasksWidget.js +++ b/src/components/Widgets/ReviewNearbyTasksWidget/ReviewNearbyTasksWidget.js @@ -191,7 +191,7 @@ export default class ReviewNearbyTasksWidget extends Component { ); const clearFiltersControl = ( -
-
-
+
+

-
    +
    • @@ -249,7 +249,9 @@ export default class ReviewNearbyTasksWidget extends Component {
- {clearFiltersControl} +
+ {clearFiltersControl} +
diff --git a/src/components/Widgets/TaskBundleWidget/Messages.js b/src/components/Widgets/TaskBundleWidget/Messages.js index 27080111e..8693b71de 100644 --- a/src/components/Widgets/TaskBundleWidget/Messages.js +++ b/src/components/Widgets/TaskBundleWidget/Messages.js @@ -24,6 +24,11 @@ export default defineMessages({ defaultMessage: "Save Current Filters" }, + clearFiltersLabel: { + id: "Widgets.TaskBundleWidget.controls.clearFilters.label", + defaultMessage: "Clear Filters" + }, + filterListLabel: { id: "Widgets.TaskBundleWidget.controls.filterList.label", defaultMessage: "Filter By:" diff --git a/src/components/Widgets/TaskBundleWidget/TaskBundleWidget.js b/src/components/Widgets/TaskBundleWidget/TaskBundleWidget.js index f3b520734..8d5d779a0 100644 --- a/src/components/Widgets/TaskBundleWidget/TaskBundleWidget.js +++ b/src/components/Widgets/TaskBundleWidget/TaskBundleWidget.js @@ -185,7 +185,7 @@ export default class TaskBundleWidget extends Component { this.props.updateUserAppSetting(this.props.user.id, {'taskBundleFilters': searchURL}) } - clearFilters = () => { + revertFilters = () => { if(this.props.clearAllFilters) { this.props.clearAllFilters() } @@ -252,7 +252,7 @@ export default class TaskBundleWidget extends Component { { {map} }
-
-
+
+

-
    +
    • @@ -413,7 +413,9 @@ const BuildBundle = props => {
-
+ +
+ {} ( @@ -431,7 +433,7 @@ const BuildBundle = props => { dropdownContent={(dropdown) => (
- +
)} /> @@ -493,8 +495,8 @@ registerWidgetType( ), descriptor ) -const ClearFiltersControl = ({clearFilters}) => { - const handleClick = () => {clearFilters()} +const RevertFiltersControl = ({revertFilters}) => { + const handleClick = () => {revertFilters()} return ( ) -} \ No newline at end of file +} + +const ClearFiltersControl = ({clearFilters}) => ( + +) \ No newline at end of file