Merge pull request #9716 from mahmoudadel54/porting_9510_2023.02.xx

[Backport 2023.02.xx]: #9510: Improving GeoFence rule filtering capabilities (#9715,#9715)
geosolutions-it · Nov 21, 2023 · 6f87cf4 · 6f87cf4
2 parents 63908b1 + b609834
commit 6f87cf4
Show file tree

Hide file tree

Showing 22 changed files with 242 additions and 56 deletions.
diff --git a/web/client/actions/rulesmanager.js b/web/client/actions/rulesmanager.js
@@ -30,11 +30,12 @@ export function delRules(ids) {
     };
 }
 
-export function setFilter(key, value) {
+export function setFilter(key, value, isResetField) {
     return {
         type: SET_FILTER,
         key,
-        value
+        value,
+        isResetField
     };
 }
 

diff --git a/web/client/api/geofence/RuleService.js b/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;
     }
@@ -83,7 +85,7 @@ const Api = ({addBaseUrl, addBaseUrlGS, getGeoServerInstance}) => ({
             .then( (response) => {
                 return toJSONPromise(response.data);
             }
-            ).then(({RuleList = {}}) => ({rules: RuleList.rule || []}));
+            ).then(({RuleList = {}}) => ({rules: [].concat(RuleList.rule || [])}));
     },
 
     getRulesCount: (rulesFiltersValues) => {

diff --git a/web/client/components/manager/rulesmanager/rulesgrid/enhancers/rulesgrid.js b/web/client/components/manager/rulesmanager/rulesgrid/enhancers/rulesgrid.js
@@ -77,14 +77,15 @@ export default compose(
             error: undefined,
             isEditing: editing
         }),
-        setFilters: (state, {filters = {}, setFilters}) => ({column, filterTerm}) => {
+        setFilters: (state, {filters = {}, setFilters}) => ({column, filterTerm, isResetField}) => {
             // Can add  some logic here to clean related filters
             if (column.key === "workspace" && filters.layer) {
                 setFilters("layer");
             } else if (column.key === "service" && filters.request) {
                 setFilters("request");
             }
-            setFilters(column.key, filterTerm);
+
+            setFilters(column.key, filterTerm, isResetField);
             return {rowsCount: 0, pages: {}};
         },
         incrementVersion: ({ version }) => () => ({

diff --git a/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/LayersFilter.jsx b/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/LayersFilter.jsx
@@ -21,7 +21,8 @@ const parentFiltersSel = createSelector(workspaceSelector, (workspace) => ({
 }));
 const selector = createSelector([filterSelector, parentFiltersSel], (filter, parentsFilter) => ({
     selected: filter.layer,
-    parentsFilter
+    parentsFilter,
+    anyFieldVal: filter.layerAny
 }));
 
 export default compose(
@@ -33,17 +34,20 @@ export default compose(
         loadData: loadLayers,
         parentsFilter: {},
         filter: false,
-        placeholder: "rulesmanager.placeholders.filter",
+        placeholder: "rulesmanager.placeholders.filterAny",
+        unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+        checkedAnyField: "rulesmanager.tooltip.showAllRules",
         loadingErrorMsg: {
             title: "rulesmanager.errorTitle",
             message: "rulesmanager.errorLoadingLayers"
-        }
+        },
+        anyFilterRuleMode: 'layerAny'
     }),
     withHandlers({
         onValueSelected: ({column = {}, onFilterChange = () => {}}) => filterTerm => {
             onFilterChange({column, filterTerm});
         }
     }),
-    localizedProps(["placeholder"]),
+    localizedProps(["placeholder", "loadingErroMsg", "checkedAnyField", "unCheckedAnyField"]),
     autoComplete
 )(PagedCombo);
diff --git a/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/RequestsFilter.jsx b/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/RequestsFilter.jsx
@@ -22,7 +22,8 @@ const selector = createSelector([filterSelector, parentFiltersSel, servicesConfi
     disabled: !filter.service,
     service: filter.service,
     parentsFilter,
-    services
+    services,
+    anyFieldVal: filter.requestAny
 }));
 
 
@@ -34,7 +35,9 @@ export default compose(
         valueField: "value",
         parentsFilter: {},
         filter: "startsWith",
-        placeholder: "rulesmanager.placeholders.filter",
+        placeholder: "rulesmanager.placeholders.filterAny",
+        unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+        checkedAnyField: "rulesmanager.tooltip.showAllRules",
         services: {
             "WFS": [
                 "DescribeFeatureType",
@@ -52,7 +55,8 @@ export default compose(
                 "GetMap",
                 "GetStyles"
             ]
-        }
+        },
+        anyFilterRuleMode: 'requestAny'
     }),
     withPropsOnChange(["service", "services"], ({services = {}, service}) => {
         return {
@@ -64,6 +68,6 @@ export default compose(
             onFilterChange({column, filterTerm});
         }
     }),
-    localizedProps(["placeholder"]),
+    localizedProps(["placeholder", "checkedAnyField", "unCheckedAnyField"]),
     fixedOptions
 )(PagedCombo);
diff --git a/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/RolesFilter.jsx b/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/RolesFilter.jsx
@@ -16,7 +16,8 @@ import { createSelector } from 'reselect';
 import { error } from '../../../../../actions/notifications';
 import { filterSelector } from '../../../../../selectors/rulesmanager';
 const selector = createSelector(filterSelector, (filter) => ({
-    selected: filter.rolename
+    selected: filter.rolename,
+    anyFieldVal: filter.roleAny
 }));
 
 export default compose(
@@ -28,17 +29,20 @@ export default compose(
         loadData: getRoles,
         parentsFilter: {},
         filter: false,
-        placeholder: "rulesmanager.placeholders.filter",
+        placeholder: "rulesmanager.placeholders.filterAny",
+        unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+        checkedAnyField: "rulesmanager.tooltip.showAllRules",
         loadingErrorMsg: {
             title: "rulesmanager.errorTitle",
             message: "rulesmanager.errorLoadingRoles"
-        }
+        },
+        anyFilterRuleMode: 'roleAny'
     }),
     withHandlers({
         onValueSelected: ({column = {}, onFilterChange = () => {}}) => filterTerm => {
             onFilterChange({column, filterTerm});
         }
     }),
-    localizedProps(["placeholder", "loadingErroMsg"]),
+    localizedProps(["placeholder", "loadingErroMsg", "checkedAnyField", "unCheckedAnyField"]),
     autoComplete
 )(PagedCombo);
diff --git a/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/ServicesFilter.jsx b/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/ServicesFilter.jsx
@@ -16,7 +16,8 @@ import { filterSelector, servicesSelector } from '../../../../../selectors/rules
 
 const selector = createSelector(filterSelector, servicesSelector, (filter, services) => ({
     selected: filter.service,
-    services
+    services,
+    anyFieldVal: filter.serviceAny
 }));
 
 export default compose(
@@ -27,19 +28,22 @@ export default compose(
         valueField: "value",
         parentsFilter: {},
         filter: "startsWith",
-        placeholder: "rulesmanager.placeholders.filter",
+        placeholder: "rulesmanager.placeholders.filterAny",
+        unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+        checkedAnyField: "rulesmanager.tooltip.showAllRules",
         data: [
             {value: "WMS", label: "WMS"},
             {value: "WFS", label: "WFS"},
             {value: "WCS", label: "WCS"}
-        ]
+        ],
+        anyFilterRuleMode: 'serviceAny'
     }),
     withPropsOnChange(["services"], ({services, data}) => ({data: services || data})),
     withHandlers({
         onValueSelected: ({column = {}, onFilterChange = () => {}}) => filterTerm => {
             onFilterChange({column, filterTerm});
         }
     }),
-    localizedProps(["placeholder"]),
+    localizedProps(["placeholder", "checkedAnyField", "unCheckedAnyField"]),
     fixedOptions
 )(PagedCombo);
diff --git a/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/UsersFilter.jsx b/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/UsersFilter.jsx
@@ -16,7 +16,8 @@ import { createSelector } from 'reselect';
 import { filterSelector } from '../../../../../selectors/rulesmanager';
 import { error } from '../../../../../actions/notifications';
 const selector = createSelector(filterSelector, (filter) => ({
-    selected: filter.username
+    selected: filter.username,
+    anyFieldVal: filter.userAny
 }));
 
 export default compose(
@@ -28,17 +29,20 @@ export default compose(
         loadData: getUsers,
         parentsFilter: {},
         filter: false,
-        placeholder: "rulesmanager.placeholders.filter",
+        placeholder: "rulesmanager.placeholders.filterAny",
+        unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+        checkedAnyField: "rulesmanager.tooltip.showAllRules",
         loadingErrorMsg: {
             title: "rulesmanager.errorTitle",
             message: "rulesmanager.errorLoadingUsers"
-        }
+        },
+        anyFilterRuleMode: 'userAny'
     }),
     withHandlers({
         onValueSelected: ({column = {}, onFilterChange = () => {}}) => filterTerm => {
             onFilterChange({column, filterTerm});
         }
     }),
-    localizedProps(["placeholder"]),
+    localizedProps(["placeholder", "loadingErroMsg", "checkedAnyField", "unCheckedAnyField"]),
     autoComplete
 )(PagedCombo);
diff --git a/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/WorkspacesFilter.jsx b/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/WorkspacesFilter.jsx
@@ -17,7 +17,8 @@ import { createSelector } from 'reselect';
 import { filterSelector } from '../../../../../selectors/rulesmanager';
 
 const selector = createSelector(filterSelector, (filter) => ({
-    selected: filter.workspace
+    selected: filter.workspace,
+    anyFieldVal: filter.workspaceAny
 }));
 
 
@@ -31,17 +32,20 @@ export default compose(
         loadData: getWorkspaces,
         parentsFilter: {},
         filter: "startsWith",
-        placeholder: "rulesmanager.placeholders.filter",
+        placeholder: "rulesmanager.placeholders.filterAny",
+        unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+        checkedAnyField: "rulesmanager.tooltip.showAllRules",
         loadingErrorMsg: {
             title: "rulesmanager.errorTitle",
             message: "rulesmanager.errorLoadingWorkspaces"
-        }
+        },
+        anyFilterRuleMode: 'workspaceAny'
     }),
     withHandlers({
         onValueSelected: ({column = {}, onFilterChange = () => {}}) => filterTerm => {
             onFilterChange({column, filterTerm});
         }
     }),
-    localizedProps(["placeholder"]),
+    localizedProps(["placeholder", "loadingErroMsg", "checkedAnyField", "unCheckedAnyField"]),
     autoComplete
 )(PagedCombo);
diff --git a/web/client/components/misc/__tests__/PagedCombobox-test.jsx b/web/client/components/misc/__tests__/PagedCombobox-test.jsx
@@ -159,4 +159,35 @@ describe("This test for PagedCombobox component", () => {
             done();
         }, 50);
     });
+    it('tests PagedCombobox anyFilter Mode', (done) => {
+        const actions = {
+            onSelect: () => {}
+        };
+        const spy = expect.spyOn(actions, "onSelect");
+        const data = [{
+            label: "label", value: "value"
+        }];
+        const comp = ReactDOM.render(<PagedCombobox onSelect={actions.onSelect} anyFieldVal={false} anyFilterRuleMode={"userAny"} data={data}/>, document.getElementById("container"));
+        expect(comp).toExist();
+        const domNode = ReactDOM.findDOMNode(comp);
+        expect(domNode).toExist();
+        const inputs = domNode.getElementsByTagName("input");
+        const checkbox = inputs[1];
+        expect(inputs.length).toEqual(2);
+        expect(checkbox.checked).toEqual(true);
+        expect(checkbox.name).toEqual('userAny');
+
+        const tool = ReactDOM.findDOMNode(TestUtils.scryRenderedDOMComponentsWithClass(comp, "rw-i rw-i-caret-down")[0]);
+        tool.click();
+        // this tests if the option list is opened
+        const firstOption = ReactDOM.findDOMNode(TestUtils.scryRenderedDOMComponentsWithClass(comp, "rw-list-option")[0]);
+        expect(firstOption).toExist();
+        const valueOption = firstOption.getElementsByTagName("span")[0];
+        expect(valueOption).toExist();
+        TestUtils.Simulate.click(firstOption);
+        setTimeout(() => {
+            expect(spy.calls.length).toEqual(1);
+            done();
+        }, 50);
+    });
 });
diff --git a/web/client/components/misc/combobox/PagedCombobox.jsx b/web/client/components/misc/combobox/PagedCombobox.jsx
@@ -55,7 +55,13 @@ class PagedCombobox extends React.Component {
         stopPropagation: PropTypes.bool,
         clearable: PropTypes.bool,
         onReset: PropTypes.func,
-        attribute: PropTypes.string
+        attribute: PropTypes.string,
+        anyFilterRuleMode: PropTypes.string,
+        onFilterChange: PropTypes.func,
+        anyFieldVal: PropTypes.bool,
+        column: PropTypes.object,
+        checkedAnyField: PropTypes.string,
+        unCheckedAnyField: PropTypes.string
     };
 
     static contextTypes = {
@@ -94,7 +100,12 @@ class PagedCombobox extends React.Component {
             placement: "top"
         },
         valueField: "value",
-        clearable: false
+        clearable: false,
+        anyFilterRuleMode: '',
+        onFilterChange: ()=>{},
+        column: {},
+        checkedAnyField: "",
+        unCheckedAnyField: ""
     };
 
     componentDidUpdate(prevProps) {
@@ -118,6 +129,21 @@ class PagedCombobox extends React.Component {
         </OverlayTrigger>);
     };
 
+    renderTooltipCheckbox = () => {
+        const { onFilterChange, anyFieldVal } = this.props;
+
+        let checkboxInput = (
+            <input onChange={(evt)=>{
+                onFilterChange({column: {key: evt.target.name}, filterTerm: !evt.target.checked});
+            }} type="checkbox" checked={!!(typeof anyFieldVal === 'boolean' && !anyFieldVal)}
+            name={this.props.anyFilterRuleMode} />
+        );
+        const tooltip = (<Tooltip id={this.props.tooltip.id + anyFieldVal ? "checked" : "unchecked"}>
+            { !!(typeof anyFieldVal === 'boolean' && !anyFieldVal) ? this.props.checkedAnyField : this.props.unCheckedAnyField }</Tooltip>);
+        return (<OverlayTrigger key={this.props.tooltip.overlayTriggerKey} placement={this.props.tooltip.placement} overlay={tooltip}>
+            { checkboxInput }
+        </OverlayTrigger>);
+    }
 
     renderPagination = () => {
         const firstPage = this.props.pagination.firstPage;
@@ -182,17 +208,30 @@ class PagedCombobox extends React.Component {
         return this.props.tooltip && this.props.tooltip.enabled ? this.renderWithTooltip(field) : field;
     }
     render() {
-        const {selectedValue: v, disabled, onReset, label: l, clearable} = this.props;
+        const {selectedValue: v, disabled, onReset, label: l, clearable, onFilterChange } = this.props;
         let label = l ? (<label>{l}</label>) : (<span/>); // TODO change "the else case" value with null ?
         return (
-            <div className="autocompleteField">
-                {label}
+            <div className={`autocompleteField ${this.props.anyFilterRuleMode ? 'd-flex' : ''}`}>
                 {clearable ? (
                     <div className={`rw-combo-clearable ${disabled && 'disabled' || ''}`}>
                         {this.renderField()}
-                        <span className={`rw-combo-clear ${!v && 'hidden' || ''}`} onClick={onReset}>x</span>
-                    </div>) : this.renderField()
+                        <span className={`rw-combo-clear ${!v && 'hidden' || ''}`} onClick={()=>{
+                            if (this.props.anyFilterRuleMode) {
+                                // reset the checkbox as well
+                                onFilterChange({column: {key: this.props.column?.key}, filterTerm: undefined, isResetField: true});
+                            } else {
+                                onReset();
+                            }
+                        }}>x</span>
+                    </div>) :
+                    this.renderField()
                 }
+                 &nbsp;
+                <div>
+                    {label}
+                    { this.props.anyFilterRuleMode ?
+                        this.renderTooltipCheckbox() : null}
+                </div>
             </div>);
     }
 }