Adds empty string fallback for index (elastic#1109)

w33ble · Sep 12, 2018 · 8389fe6 · 8389fe6
1 parent 219445c
commit 8389fe6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/public/components/es_field_select/es_field_select.js b/public/components/es_field_select/es_field_select.js
@@ -31,3 +31,7 @@ ESFieldSelect.propTypes = {
   value: PropTypes.string,
   fields: PropTypes.array,
 };
+
+ESFieldSelect.defaultProps = {
+  fields: [],
+};
diff --git a/public/components/es_field_select/index.js b/public/components/es_field_select/index.js
@@ -6,7 +6,7 @@ export const ESFieldSelect = compose(
   withState('fields', 'setFields', []),
   lifecycle({
     componentDidMount() {
-      getFields(this.props.index).then(this.props.setFields);
+      if (this.props.index) getFields(this.props.index).then(this.props.setFields);
     },
     componentDidUpdate({ index }) {
       const { value, onChange, setFields } = this.props;

diff --git a/public/components/es_fields_select/es_fields_select.js b/public/components/es_fields_select/es_fields_select.js
@@ -33,4 +33,5 @@ ESFieldsSelect.propTypes = {
 
 ESFieldsSelect.defaultProps = {
   selected: [],
+  fields: [],
 };
diff --git a/public/components/es_fields_select/index.js b/public/components/es_fields_select/index.js
@@ -6,7 +6,8 @@ export const ESFieldsSelect = compose(
   withState('fields', 'setFields', []),
   lifecycle({
     componentDidMount() {
-      getFields(this.props.index).then((fields = []) => this.props.setFields(fields));
+      if (this.props.index)
+        getFields(this.props.index).then((fields = []) => this.props.setFields(fields));
     },
     componentDidUpdate({ index }) {
       const { setFields, onChange, selected } = this.props;

diff --git a/public/expression_types/datasources/esdocs.js b/public/expression_types/datasources/esdocs.js
@@ -24,6 +24,10 @@ const EsdocsDatasource = ({ args, updateArgs }) => {
     return 'query';
   };
 
+  const getIndex = () => {
+    return getSimpleArg('index', args)[0] || '';
+  };
+
   const getQuery = () => {
     return getSimpleArg(getArgName(), args)[0] || '';
   };
@@ -42,7 +46,7 @@ const EsdocsDatasource = ({ args, updateArgs }) => {
   const fields = getFields();
   const [sortField, sortOrder] = getSortBy();
 
-  const index = getSimpleArg('index', args)[0].toLowerCase();
+  const index = getIndex().toLowerCase();
 
   const sortOptions = [{ value: 'asc', text: 'Ascending' }, { value: 'desc', text: 'Descending' }];