Merge branch 'russgove-master' into dev

Author: Alex Terentiev

src/controls/listItemPicker/ComboBoxListItemPicker.tsx

@@ -52,7 +52,7 @@ export class ComboBoxListItemPicker extends React.Component<IComboBoxListItemPic
     //query += filter;
     let keyColumnName = keyColumnInternalName || "Id";
 
-    if (!this._options || listId !== this.props.listId) {
+    if (!this._options || listId !== this.props.listId|| filter !== this.props.filter) {
       const listItems = await this._listItemRepo.getListItemsByFilterClause(query,
         listId,
         columnInternalName,
@@ -61,12 +61,12 @@ export class ComboBoxListItemPicker extends React.Component<IComboBoxListItemPic
         itemLimit || 100,
         orderBy);
 
-        this._options = listItems.map(option => {
-          return {
-            key: option[keyColumnName],
-            text: option[columnInternalName || "Id"]
-          };
-        });
+      this._options = listItems.map(option => {
+        return {
+          key: option[keyColumnName],
+          text: option[columnInternalName || "Id"]
+        };
+      });
     }
 
     const selectedItems = this._getSelectedItems(props);
@@ -87,6 +87,10 @@ export class ComboBoxListItemPicker extends React.Component<IComboBoxListItemPic
       });
       await this.loadOptions(nextProps, false);
     }
+    if (nextProps.filter !== this.props.filter) {
+
+      await this.loadOptions(nextProps, false);
+    }
     if (!isEqual(nextProps.defaultSelectedItems, this.props.defaultSelectedItems)) {
       const selectedItems = this._getSelectedItems(nextProps);
       this.setState({