[ARVADOS-WORKBENCH2] updated: 1.2.0-696-g3c21a43
Git user
git at public.curoverse.com
Mon Oct 22 07:34:55 EDT 2018
Summary of changes:
.../search-bar-advanced-properties-view.tsx | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
via 3c21a435928b34cbcc6e261897855998555ab73a (commit)
from 4ae10b1717541336c32778bc69bd1d4ea8fc78ab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 3c21a435928b34cbcc6e261897855998555ab73a
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Mon Oct 22 13:34:43 2018 +0200
refs #14356-it-is-possible-to-save-a-search-query-without-the-key-value-or-both
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/views-components/search-bar/search-bar-advanced-properties-view.tsx b/src/views-components/search-bar/search-bar-advanced-properties-view.tsx
index 01fc6a1..0384de2 100644
--- a/src/views-components/search-bar/search-bar-advanced-properties-view.tsx
+++ b/src/views-components/search-bar/search-bar-advanced-properties-view.tsx
@@ -8,10 +8,10 @@ import { connect } from 'react-redux';
import { InjectedFormProps, formValueSelector } from 'redux-form';
import { Grid, withStyles, StyleRulesCallback, WithStyles, Button } from '@material-ui/core';
import { RootState } from '~/store/store';
-import {
- SEARCH_BAR_ADVANCE_FORM_NAME,
- changeAdvanceFormProperty,
- updateAdvanceFormProperties
+import {
+ SEARCH_BAR_ADVANCE_FORM_NAME,
+ changeAdvanceFormProperty,
+ updateAdvanceFormProperties
} from '~/store/search-bar/search-bar-actions';
import { PropertyValues } from '~/models/search-bar';
import { ArvadosTheme } from '~/common/custom-theme';
@@ -45,8 +45,8 @@ interface SearchBarAdvancedPropertiesViewActionProps {
getAllFields: (propertyValues: PropertyValues[]) => PropertyValues[] | [];
}
-type SearchBarAdvancedPropertiesViewProps = SearchBarAdvancedPropertiesViewDataProps
- & SearchBarAdvancedPropertiesViewActionProps
+type SearchBarAdvancedPropertiesViewProps = SearchBarAdvancedPropertiesViewDataProps
+ & SearchBarAdvancedPropertiesViewActionProps
& InjectedFormProps & WithStyles<CssRules>;
const selector = formValueSelector(SEARCH_BAR_ADVANCE_FORM_NAME);
@@ -85,15 +85,16 @@ export const SearchBarAdvancedPropertiesView = connect(mapStateToProps, mapDispa
<Button className={classes.button} onClick={() => addProp(propertyValues)}
color="primary"
size='small'
- variant="contained">
+ variant="contained"
+ disabled={!Boolean(propertyValues.key && propertyValues.value)}>
Add
</Button>
</Grid>
<Grid item xs={2} />
<Grid container item xs={10} spacing={8}>
- <Chips values={getAllFields(fields)}
+ <Chips values={getAllFields(fields)}
deletable
- onChange={setProps}
+ onChange={setProps}
getLabel={(field: PropertyValues) => `${field.key}: ${field.value}`} />
</Grid>
</Grid>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list