-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(Browsing Issues): implement JQL filters search
Search for issues with your own custom JQL! Click the select over the sidebar and choose one of your saved JIRA JQL filters. Edit and create new filters! ISSUES CLOSED: #57, #48, #85
- Loading branch information
1 parent
4667376
commit 415bb76
Showing
7 changed files
with
244 additions
and
106 deletions.
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
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
147 changes: 147 additions & 0 deletions
147
app/containers/Sidebar/IssuesSourcePicker/JQLFilter.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,147 @@ | ||
| // @flow | ||
| import React from 'react'; | ||
| import InlineDialog from '@atlaskit/inline-dialog'; | ||
| import { connect } from 'react-redux'; | ||
| import { FieldTextStateless as FieldText } from '@atlaskit/field-text'; | ||
| import Spinner from '@atlaskit/spinner'; | ||
| import Button from '@atlaskit/button'; | ||
| import { Flex } from 'components'; | ||
|
|
||
| import { | ||
| getUiState, | ||
| getResourceStatus, | ||
| } from 'selectors'; | ||
|
|
||
| import { | ||
| filtersActions, | ||
| uiActions, | ||
| } from 'actions'; | ||
|
|
||
| import type { | ||
| Dispatch, | ||
| SelectedOption, | ||
| } from 'types'; | ||
|
|
||
| import * as R from 'ramda'; | ||
|
|
||
| import { InputLabel } from './styled'; | ||
|
|
||
| type Props = { | ||
| newJQLFilterName: string | null, | ||
| newJQLFilterValue: string | null, | ||
| newJQLFilterErrors: Array<any>, | ||
| newJQLFilterSaving: boolean, | ||
| newJQLFilterAdding: boolean, | ||
| saveFilterDialogOpen: boolean, | ||
| selectedFilter: SelectedOption, | ||
| dispatch: Dispatch, | ||
| } | ||
|
|
||
| const JQLFilter = ({ | ||
| newJQLFilterName, | ||
| newJQLFilterValue, | ||
| newJQLFilterErrors, | ||
| newJQLFilterSaving, | ||
| newJQLFilterAdding, | ||
| saveFilterDialogOpen, | ||
| selectedFilter, | ||
| dispatch, | ||
| }: Props) => ( | ||
| <Flex column style={{ marginTop: 8 }}> | ||
| <FieldText | ||
| value={newJQLFilterValue || R.path(['meta', 'filter', 'jql'], selectedFilter)} | ||
| isInvalid={newJQLFilterErrors.length > 0} | ||
| isLabelHidden | ||
| invalidMessage={newJQLFilterErrors.join(', ')} | ||
| onChange={(e) => { | ||
| dispatch(uiActions.setUiState('newJQLFilterErrors', [])); | ||
| if (e.target.value === R.path(['meta', 'filter', 'jql'], selectedFilter)) { | ||
| dispatch(uiActions.setUiState('newJQLFilterValue', null)); | ||
| } else { | ||
| dispatch(uiActions.setUiState('newJQLFilterValue', e.target.value)); | ||
| } | ||
| }} | ||
| shouldFitContainer | ||
| /> | ||
| <Flex justifyContent="flex-end"> | ||
| <InlineDialog | ||
| isOpen={saveFilterDialogOpen} | ||
| onClose={() => dispatch(uiActions.setUiState('saveFilterDialogOpen', false))} | ||
| content={ | ||
| <Flex column> | ||
| <InputLabel>New filter name</InputLabel> | ||
| <Flex alignItems="center"> | ||
| <FieldText | ||
| placeholder="New filter name" | ||
| isLabelHidden | ||
| value={newJQLFilterName} | ||
| onChange={e => dispatch(uiActions.setUiState('newJQLFilterName', e.target.value))} | ||
| shouldFitContainer | ||
| /> | ||
| <Button | ||
| appearance="link" | ||
| iconAfter={newJQLFilterAdding ? <Spinner /> : null} | ||
| onClick={() => dispatch( | ||
| filtersActions.createFilterRequest({ | ||
| name: newJQLFilterName, | ||
| jql: newJQLFilterValue, | ||
| }), | ||
| )} | ||
| > | ||
| Save | ||
| </Button> | ||
| </Flex> | ||
| </Flex> | ||
| } | ||
| > | ||
| <Button | ||
| appearance="link" | ||
| onClick={() => dispatch(uiActions.setUiState('saveFilterDialogOpen', !saveFilterDialogOpen))} | ||
| isDisabled={!newJQLFilterValue} | ||
| > | ||
| New | ||
| </Button> | ||
| </InlineDialog> | ||
| <Button | ||
| appearance="link" | ||
| onClick={() => dispatch( | ||
| filtersActions.updateFilterRequest({ | ||
| oldFilter: selectedFilter.meta.filter, | ||
| newJQLString: newJQLFilterValue, | ||
| }), | ||
| )} | ||
| isDisabled={!newJQLFilterValue} | ||
| iconAfter={newJQLFilterSaving ? <Spinner /> : null} | ||
| > | ||
| Save | ||
| </Button> | ||
| <Button | ||
| appearance="subtle-link" | ||
| isDisabled={!newJQLFilterValue} | ||
| onClick={() => dispatch(uiActions.setUiState('newJQLFilterValue', null))} | ||
| > | ||
| Reset | ||
| </Button> | ||
| </Flex> | ||
| </Flex> | ||
| ); | ||
|
|
||
| const connector = connect( | ||
| state => ({ | ||
| newJQLFilterName: getUiState('newJQLFilterName')(state), | ||
| newJQLFilterValue: getUiState('newJQLFilterValue')(state), | ||
| newJQLFilterSaving: getResourceStatus( | ||
| state, | ||
| 'filters.requests.updateFilter.status', | ||
| ).pending, | ||
| newJQLFilterAdding: getResourceStatus( | ||
| state, | ||
| 'filters.requests.createFilter.status', | ||
| ).pending, | ||
| newJQLFilterErrors: getUiState('newJQLFilterErrors')(state), | ||
| saveFilterDialogOpen: getUiState('saveFilterDialogOpen')(state), | ||
| }), | ||
| dispatch => ({ dispatch }), | ||
| ); | ||
|
|
||
| export default connector(JQLFilter); |
Oops, something went wrong.