diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js b/packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js index db0d2d5542..352eb7c074 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js @@ -63,12 +63,16 @@ class InputWithAutoFocus extends React.Component { } } +InputWithAutoFocus.defaultProps = { + filterToFocus: null, +}; + InputWithAutoFocus.propTypes = { filter: PropTypes.object.isRequired, filterToFocus: PropTypes.oneOfType([ PropTypes.object, PropTypes.number, - ]).isRequired, + ]), index: PropTypes.number.isRequired, inputStyle: PropTypes.object.isRequired, name: PropTypes.string.isRequired, diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/index.js b/packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/index.js index 2239fefb8c..422690d0a0 100644 --- a/packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/index.js @@ -30,6 +30,9 @@ function FilterOptions({ filter, filterToFocus, index, onChange, onClickAdd, onC // This component is needed in order to add the date icon inside the InputDate const Wrapper = get(schema, [filter.attr, 'type'], 'string') === 'date' ? InputWrapper : 'div'; + const selectOptionsSchema = Object + .keys(schema) + .filter(x => schema[x].type !== 'json'); return (
@@ -38,7 +41,7 @@ function FilterOptions({ filter, filterToFocus, index, onChange, onClickAdd, onC onChange={onChange} name={`${index}.attr`} value={get(filter, 'attr', '')} - selectOptions={Object.keys(schema)} + selectOptions={selectOptionsSchema} style={selectStyle} />