-
Notifications
You must be signed in to change notification settings - Fork 188
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
React/redux Task Search #1121
Merged
Merged
React/redux Task Search #1121
Changes from 16 commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
ac72a79
New task search page controller+view+root component
kwm4385 fffbe58
Implement the redux form
kwm4385 6bcfdcc
validation
kwm4385 4e69800
More date validation
kwm4385 14a0a58
handle submit
kwm4385 b2b26a1
Some pagination
kwm4385 5c8b569
more paging
kwm4385 1dce9e7
Table rendering
kwm4385 1098922
Merge decaf
kwm4385 e38baea
initial fetch
kwm4385 1d076d6
fix date naming?
kwm4385 85fd260
neaten up columns
kwm4385 4316457
don't refresh, also backtrack on getting an empty page
kwm4385 f99561c
Loading state
kwm4385 2de1cbb
properly disable next on hitting end
kwm4385 e164071
delete all the things
kwm4385 f4fa9f4
Remove comment block
kwm4385 3aafa8e
Move actions into new format
kwm4385 9d47e1e
support global task search (from admin menu)
kwm4385 dd26215
Merge branch "decaf"
kwm4385 ace0eb9
Add count options
kwm4385 1b2fd4f
25
kwm4385 8caa4e1
Only show if results
kwm4385 85e2859
Delete DateEntry
kwm4385 6b18c6f
Refactor query params into utility function
kwm4385 c45cff4
use format string
kwm4385 725fcfd
delinted
kwm4385 d9f5335
Fix proptypes
kwm4385 d6ca7c4
Merge branch 'decaf'
kwm4385 651bbaa
Merge branch 'decaf'
kwm4385 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
import { buildApiAction } from './base'; | ||
|
||
export const FetchForDeploy = buildApiAction('FETCH_TASK_HISTORY_FOR_DEPLOY', (requestId, deployId, count, page) => { | ||
return {url: `/history/request/${requestId}/tasks?requestId=${requestId}&deployId=${deployId}&count=${count}&page=${page}`} | ||
}); | ||
|
||
export const FetchAction = buildApiAction('FETCH_TASK_HISTORY', | ||
({requestId, deployId = null, host = null, lastTaskStatus = null, startedAfter = null, startedBefore = null, orderDirection = null, count, page}) => { | ||
let params = []; | ||
if (deployId) params.push(`&deployId=${deployId}`); | ||
if (host) params.push(`&host=${host}`); | ||
if (lastTaskStatus) params.push(`&lastTaskStatus=${lastTaskStatus}`); | ||
if (startedAfter) params.push(`&startedAfter=${startedAfter}`); | ||
if (startedBefore) params.push(`&startedBefore=${startedBefore}`); | ||
if (orderDirection) params.push(`&orderDirection=${orderDirection}`); | ||
return { | ||
url: `/history/request/${requestId}/tasks?count=${count}&page=${page}${params.join('')}` | ||
} | ||
}); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,4 +18,3 @@ let TaskStateLabel = React.createClass({ | |
}); | ||
|
||
export default TaskStateLabel; | ||
|
15 changes: 15 additions & 0 deletions
15
SingularityUI/app/components/common/formItems/ReduxSelect.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
import React from 'react'; | ||
import Select from 'react-select'; | ||
|
||
// Wrapper for react-select for use with redux form. Needs to override onBlur of react-select | ||
// More info: https://github.com/erikras/redux-form/issues/82 | ||
export default class ReduxSelect extends React.Component { | ||
render() { | ||
return ( | ||
<Select | ||
{...this.props} | ||
onBlur={_.noop} | ||
/> | ||
) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 0 additions & 112 deletions
112
SingularityUI/app/components/taskSearch/DisplayResults.jsx
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we update this to match the API layout that @wolfd rolled out?