Skip to content

Commit

Permalink
geosolutions-it#9510: fix testers reviews
Browse files Browse the repository at this point in the history
** description:
- fix css issue of white space below dropdown lists if user selects one item from them in rules manager page
- fix issue in filtering roles dropdown
  • Loading branch information
mahmoudadel54 committed Nov 17, 2023
1 parent b34aaab commit 67a168c
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
2 changes: 2 additions & 0 deletions web/client/api/geofence/RuleService.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ const normalizeKey = (key) => {
return 'userName';
case 'rolename':
return 'groupName';
case 'roleAny':
return 'groupAny';
default:
return key;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -36,7 +36,7 @@ export default compose(
title: "rulesmanager.errorTitle",
message: "rulesmanager.errorLoadingRoles"
},
anyFilterRuleMode: 'groupAny'
anyFilterRuleMode: 'roleAny'
}),
withHandlers({
onValueSelected: ({column = {}, onFilterChange = () => {}}) => filterTerm => {
Expand Down
2 changes: 1 addition & 1 deletion web/client/reducers/rulesmanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}});
}
Expand Down
2 changes: 1 addition & 1 deletion web/client/selectors/__tests__/rulesmanager-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('test rules manager selectors', () => {
id: 'rules1',
priority: 1,
roleName: 'role1',
groupAny: '*',
roleAny: '*',
userName: '*',
userAny: '*',
service: '*',
Expand Down
2 changes: 1 addition & 1 deletion web/client/selectors/rulesmanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 : '*'});
Expand Down
3 changes: 2 additions & 1 deletion web/client/themes/default/less/autocomplete.less
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
.rw-combobox .rw-btn {
overflow: hidden;
}
.d-flex{
.autocompleteField.d-flex{
display: flex;
height: 100%;
}

0 comments on commit 67a168c

Please sign in to comment.