diff --git a/SingularityUI/app/components/requests/RequestsPage.jsx b/SingularityUI/app/components/requests/RequestsPage.jsx index d8643ae1df..0f3f1fb0f7 100644 --- a/SingularityUI/app/components/requests/RequestsPage.jsx +++ b/SingularityUI/app/components/requests/RequestsPage.jsx @@ -41,6 +41,7 @@ class RequestsPage extends Component { fetchTaskFiles: PropTypes.func, scaleRequest: PropTypes.func, bounceRequest: PropTypes.func, + isFetchingRequests: PropTypes.bool, params: PropTypes.object, router: PropTypes.object, filter: PropTypes.shape({ @@ -115,7 +116,7 @@ class RequestsPage extends Component { render() { let displayRequests = [] - if (this.props.requestsInState.length) { + if (this.props.requestsInState.length || !this.props.isFetchingRequests) { displayRequests = filterSelector({requestsInState: this.props.requestsInState, filter: this.props.filter, requestUtilizations: this.props.requestUtilizations}); } else if (this.props.requestIds.data.length) { const options = _.map(this.props.requestIds.data, (id) => ({ @@ -130,7 +131,7 @@ class RequestsPage extends Component { if (this.state.loading) { table = ; } else if (!displayRequests.length) { - table =

No requests found. You may not be part of the correct groups or teams to view the desired requests.

; + table =

No requests found

; } else { table = ( {requestId && !this.props.params.requestId && this.renderTag('Request ID', requestId)}{' '} diff --git a/SingularityUI/app/components/taskSearch/TaskSearchFilters.jsx b/SingularityUI/app/components/taskSearch/TaskSearchFilters.jsx index 725d97c936..8dee7c5817 100644 --- a/SingularityUI/app/components/taskSearch/TaskSearchFilters.jsx +++ b/SingularityUI/app/components/taskSearch/TaskSearchFilters.jsx @@ -21,6 +21,7 @@ class TaskSearchFilters extends React.Component { handleSubmit(event) { event.preventDefault(); if (this.props.valid) { + console.log(this.props.fields) const result = _.mapObject(this.props.fields, (field) => field.value); this.props.onSearch(result); } @@ -95,7 +96,7 @@ class TaskSearchFilters extends React.Component {
- +