projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20493-optional-array' refs #20493
[arvados-workbench2.git]
/
src
/
views-components
/
search-bar
/
search-bar-view.tsx
diff --git
a/src/views-components/search-bar/search-bar-view.tsx
b/src/views-components/search-bar/search-bar-view.tsx
index 20536fd7e1422d2e3771829deb33e897eafed8d2..284083477f00e2f4c13f1d13cee483367bbbf630 100644
(file)
--- a/
src/views-components/search-bar/search-bar-view.tsx
+++ b/
src/views-components/search-bar/search-bar-view.tsx
@@
-2,7
+2,7
@@
//
// SPDX-License-Identifier: AGPL-3.0
//
// SPDX-License-Identifier: AGPL-3.0
-import
* as
React from 'react';
+import React from 'react';
import { compose } from 'redux';
import {
IconButton,
import { compose } from 'redux';
import {
IconButton,
@@
-15,26
+15,26
@@
import {
} from '@material-ui/core';
import SearchIcon from '@material-ui/icons/Search';
import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
} from '@material-ui/core';
import SearchIcon from '@material-ui/icons/Search';
import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
-import { ArvadosTheme } from '
~/
common/custom-theme';
-import { SearchView } from '
~/
store/search-bar/search-bar-reducer';
+import { ArvadosTheme } from 'common/custom-theme';
+import { SearchView } from 'store/search-bar/search-bar-reducer';
import {
SearchBarBasicView,
SearchBarBasicViewDataProps,
SearchBarBasicViewActionProps
import {
SearchBarBasicView,
SearchBarBasicViewDataProps,
SearchBarBasicViewActionProps
-} from '
~/
views-components/search-bar/search-bar-basic-view';
+} from 'views-components/search-bar/search-bar-basic-view';
import {
SearchBarAutocompleteView,
SearchBarAutocompleteViewDataProps,
SearchBarAutocompleteViewActionProps
import {
SearchBarAutocompleteView,
SearchBarAutocompleteViewDataProps,
SearchBarAutocompleteViewActionProps
-} from '
~/
views-components/search-bar/search-bar-autocomplete-view';
+} from 'views-components/search-bar/search-bar-autocomplete-view';
import {
SearchBarAdvancedView,
SearchBarAdvancedViewDataProps,
SearchBarAdvancedViewActionProps
import {
SearchBarAdvancedView,
SearchBarAdvancedViewDataProps,
SearchBarAdvancedViewActionProps
-} from '
~/
views-components/search-bar/search-bar-advanced-view';
-import { KEY_CODE_DOWN, KEY_CODE_ESC, KEY_CODE_UP, KEY_ENTER } from "
~/
common/codes";
+} from 'views-components/search-bar/search-bar-advanced-view';
+import { KEY_CODE_DOWN, KEY_CODE_ESC, KEY_CODE_UP, KEY_ENTER } from "common/codes";
import { debounce } from 'debounce';
import { debounce } from 'debounce';
-import { Vocabulary } from '
~/
models/vocabulary';
+import { Vocabulary } from 'models/vocabulary';
import { connectVocabulary } from '../resource-properties-form/property-field-common';
type CssRules = 'container' | 'containerSearchViewOpened' | 'input' | 'view';
import { connectVocabulary } from '../resource-properties-form/property-field-common';
type CssRules = 'container' | 'containerSearchViewOpened' | 'input' | 'view';
@@
-128,10
+128,10
@@
const handleKeyDown = (e: React.KeyboardEvent, props: SearchBarViewProps) => {
const handleInputClick = (e: React.MouseEvent, props: SearchBarViewProps) => {
if (props.searchValue) {
props.onSetView(SearchView.AUTOCOMPLETE);
const handleInputClick = (e: React.MouseEvent, props: SearchBarViewProps) => {
if (props.searchValue) {
props.onSetView(SearchView.AUTOCOMPLETE);
- props.openSearchView();
} else {
} else {
- props.
closeView(
);
+ props.
onSetView(SearchView.BASIC
);
}
}
+ props.openSearchView();
};
const handleDropdownClick = (e: React.MouseEvent, props: SearchBarViewProps) => {
};
const handleDropdownClick = (e: React.MouseEvent, props: SearchBarViewProps) => {
@@
-177,7
+177,7
@@
export const SearchBarView = compose(connectVocabulary, withStyles(styles))(
<Paper className={isPopoverOpen ? classes.containerSearchViewOpened : classes.container} >
<form onSubmit={this.handleSubmit}>
<Input
<Paper className={isPopoverOpen ? classes.containerSearchViewOpened : classes.container} >
<form onSubmit={this.handleSubmit}>
<Input
- data-cy='search-input-field'
+ data-cy='search
bar
-input-field'
className={classes.input}
onChange={this.handleChange}
placeholder="Search"
className={classes.input}
onChange={this.handleChange}
placeholder="Search"