#9510: Improving GeoFence rule filtering capabilities [fix rule manager roles filter]

web/client/api/geofence/RuleService.js

@@ -43,6 +43,8 @@ const normalizeKey = (key) => {
  return 'userName';
  case 'rolename':
  return 'groupName';
+ case 'roleAny':
+ return 'groupAny';
  default:
  return key;
  }

web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/RolesFilter.jsx

@@ -17,7 +17,7 @@ import { error } from '../../../../../actions/notifications';
 import { filterSelector } from '../../../../../selectors/rulesmanager';
 const selector = createSelector(filterSelector, (filter) => ({
  selected: filter.rolename,
- anyFieldVal: filter.groupAny
+ anyFieldVal: filter.roleAny
 }));
 
 export default compose(
@@ -36,7 +36,7 @@ export default compose(
  title: "rulesmanager.errorTitle",
  message: "rulesmanager.errorLoadingRoles"
  },
- anyFilterRuleMode: 'groupAny'
+ anyFilterRuleMode: 'roleAny'
  }),
  withHandlers({
  onValueSelected: ({column = {}, onFilterChange = () => {}}) => filterTerm => {

web/client/reducers/rulesmanager.js

@@ -108,7 +108,7 @@ function rulesmanager(state = defaultState, action) {
  const {key, value, isResetField} = action;
  if (isResetField) {
  if (key === "rolename") {
- return assign({}, state, {filters: {...state.filters, [key]: value, ['groupAny']: undefined}});
+ return assign({}, state, {filters: {...state.filters, [key]: value, ['roleAny']: undefined}});
  } else if (key === "username") {
  return assign({}, state, {filters: {...state.filters, [key]: value, ['userAny']: undefined}});
  }

web/client/selectors/__tests__/rulesmanager-test.js

@@ -31,7 +31,7 @@ describe('test rules manager selectors', () => {
  id: 'rules1',
  priority: 1,
  roleName: 'role1',
- groupAny: '*',
+ roleAny: '*',
  userName: '*',
  userAny: '*',
  service: '*',

web/client/selectors/rulesmanager.js

@@ -21,7 +21,7 @@ export const rulesSelector = (state) => {
  assign(formattedRule, {'id': rule.id});
  assign(formattedRule, {'priority': rule.priority});
  assign(formattedRule, {'roleName': rule.roleName ? rule.roleName : '*'});
- assign(formattedRule, {'groupAny': rule.groupAny ? rule.groupAny : '*'});
+ assign(formattedRule, {'roleAny': rule.roleAny ? rule.roleAny : '*'});
  assign(formattedRule, {'userName': rule.userName ? rule.userName : '*'});
  assign(formattedRule, {'userAny': rule.userAny ? rule.userAny : '*'});
  assign(formattedRule, {'service': rule.service ? rule.service : '*'});

web/client/themes/default/less/autocomplete.less

@@ -38,6 +38,7 @@
 .rw-combobox .rw-btn {
  overflow: hidden;
 }
-.d-flex{
+.autocompleteField.d-flex{
  display: flex;
+ height: 100%;
 }