geosolutions-it#9510: resolve review comments

mahmoudadel54 · Oct 31, 2023 · b417347 · b417347
1 parent 6920989
commit b417347
Show file tree

Hide file tree

Showing 13 changed files with 53 additions and 41 deletions.
diff --git a/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/LayersFilter.jsx b/web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/LayersFilter.jsx
@@ -35,8 +35,8 @@ export default compose(
  parentsFilter: {},
  filter: false,
  placeholder: "rulesmanager.placeholders.filterAny",
- checkedTooltip: "Show all eligible rules",
- unCheckedTooltip: "Filter list using selected value",
+ unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+ checkedAnyField: "rulesmanager.tooltip.showAllRules",
  loadingErrorMsg: {
  title: "rulesmanager.errorTitle",
  message: "rulesmanager.errorLoadingLayers"
@@ -48,6 +48,6 @@ export default compose(
  onFilterChange({column, filterTerm});
  }
  }),
- localizedProps(["placeholder", "loadingErroMsg", "checkedTooltip", "unCheckedTooltip"]),
+ 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
@@ -36,8 +36,8 @@ export default compose(
  parentsFilter: {},
  filter: "startsWith",
  placeholder: "rulesmanager.placeholders.filterAny",
- checkedTooltip: "Show all eligible rules",
- unCheckedTooltip: "Filter list using selected value",
+ unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+ checkedAnyField: "rulesmanager.tooltip.showAllRules",
  services: {
  "WFS": [
  "DescribeFeatureType",
@@ -68,6 +68,6 @@ export default compose(
  onFilterChange({column, filterTerm});
  }
  }),
- localizedProps(["placeholder", "checkedTooltip", "unCheckedTooltip"]),
+ 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
@@ -30,8 +30,8 @@ export default compose(
  parentsFilter: {},
  filter: false,
  placeholder: "rulesmanager.placeholders.filterAny",
- checkedTooltip: "Show all eligible rules",
- unCheckedTooltip: "Filter list using selected value",
+ unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+ checkedAnyField: "rulesmanager.tooltip.showAllRules",
  loadingErrorMsg: {
  title: "rulesmanager.errorTitle",
  message: "rulesmanager.errorLoadingRoles"
@@ -43,6 +43,6 @@ export default compose(
  onFilterChange({column, filterTerm});
  }
  }),
- localizedProps(["placeholder", "loadingErroMsg", "checkedTooltip", "unCheckedTooltip"]),
+ 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
@@ -29,8 +29,8 @@ export default compose(
  parentsFilter: {},
  filter: "startsWith",
  placeholder: "rulesmanager.placeholders.filterAny",
- checkedTooltip: "Show all eligible rules",
- unCheckedTooltip: "Filter list using selected value",
+ unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+ checkedAnyField: "rulesmanager.tooltip.showAllRules",
  data: [
  {value: "WMS", label: "WMS"},
  {value: "WFS", label: "WFS"},
@@ -44,6 +44,6 @@ export default compose(
  onFilterChange({column, filterTerm});
  }
  }),
- localizedProps(["placeholder", "checkedTooltip", "unCheckedTooltip"]),
+ 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
@@ -17,7 +17,7 @@ import { filterSelector } from '../../../../../selectors/rulesmanager';
 import { error } from '../../../../../actions/notifications';
 const selector = createSelector(filterSelector, (filter) => ({
  selected: filter.username,
- anyFieldVal: filter.anyUser
+ anyFieldVal: filter.userAny
 }));
 
 export default compose(
@@ -30,8 +30,8 @@ export default compose(
  parentsFilter: {},
  filter: false,
  placeholder: "rulesmanager.placeholders.filterAny",
- checkedTooltip: "Show all eligible rules",
- unCheckedTooltip: "Filter list using selected value",
+ unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+ checkedAnyField: "rulesmanager.tooltip.showAllRules",
  loadingErrorMsg: {
  title: "rulesmanager.errorTitle",
  message: "rulesmanager.errorLoadingUsers"
@@ -43,6 +43,6 @@ export default compose(
  onFilterChange({column, filterTerm});
  }
  }),
- localizedProps(["placeholder", "loadingErroMsg", "checkedTooltip", "unCheckedTooltip"]),
+ 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
@@ -33,8 +33,8 @@ export default compose(
  parentsFilter: {},
  filter: "startsWith",
  placeholder: "rulesmanager.placeholders.filterAny",
- checkedTooltip: "Show all eligible rules",
- unCheckedTooltip: "Filter list using selected value",
+ unCheckedAnyField: "rulesmanager.tooltip.filterRuleList",
+ checkedAnyField: "rulesmanager.tooltip.showAllRules",
  loadingErrorMsg: {
  title: "rulesmanager.errorTitle",
  message: "rulesmanager.errorLoadingWorkspaces"
@@ -46,6 +46,6 @@ export default compose(
  onFilterChange({column, filterTerm});
  }
  }),
- localizedProps(["placeholder", "loadingErroMsg", "checkedTooltip", "unCheckedTooltip"]),
+ localizedProps(["placeholder", "loadingErroMsg", "checkedAnyField", "unCheckedAnyField"]),
  autoComplete
 )(PagedCombo);
diff --git a/web/client/components/misc/combobox/PagedCombobox.jsx b/web/client/components/misc/combobox/PagedCombobox.jsx
@@ -60,8 +60,8 @@ class PagedCombobox extends React.Component {
  onFilterChange: PropTypes.func,
  anyFieldVal: PropTypes.bool,
  column: PropTypes.object,
- checkedTooltip: PropTypes.string,
- unCheckedTooltip: PropTypes.string
+ checkedAnyField: PropTypes.string,
+ unCheckedAnyField: PropTypes.string
  };
 
  static contextTypes = {
@@ -104,8 +104,8 @@ class PagedCombobox extends React.Component {
  anyFilterRuleMode: '',
  onFilterChange: ()=>{},
  column: {},
- checkedTooltip: "",
- unCheckedTooltip: ""
+ checkedAnyField: "",
+ unCheckedAnyField: ""
  };
 
  componentDidUpdate(prevProps) {
@@ -129,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;
@@ -193,7 +208,7 @@ 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, onFilterChange, anyFieldVal } = 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 ${this.props.anyFilterRuleMode ? 'd-flex' : ''}`}>
@@ -215,10 +230,7 @@ class PagedCombobox extends React.Component {
  <div>
  {label}
  { this.props.anyFilterRuleMode ?
- <input onChange={(evt)=>{
- onFilterChange({column: {key: evt.target.name}, filterTerm: !evt.target.checked});
- }} type="checkbox" checked={!!(typeof anyFieldVal === 'boolean' && !anyFieldVal)} title={anyFieldVal ? this.props.unCheckedTooltip : this.props.checkedTooltip}
- name={this.props.anyFilterRuleMode} /> : null}
+ this.renderTooltipCheckbox() : null}
  </div>
  </div>);
  }

diff --git a/web/client/reducers/rulesmanager.js b/web/client/reducers/rulesmanager.js
@@ -108,11 +108,11 @@ function rulesmanager(state = defaultState, action) {
  const {key, value, isResetField} = action;
  if (isResetField) {
  if (key === "rolename") {
- return assign({}, state, {filters: {...state.filters, [key]: value, ['groupAny']: true}});
+ return assign({}, state, {filters: {...state.filters, [key]: value, ['groupAny']: undefined}});
  } else if (key === "username") {
- return assign({}, state, {filters: {...state.filters, [key]: value, ['userAny']: true}});
+ return assign({}, state, {filters: {...state.filters, [key]: value, ['userAny']: undefined}});
  }
- return assign({}, state, {filters: {...state.filters, [key]: value, [key + 'Any']: true}});
+ return assign({}, state, {filters: {...state.filters, [key]: value, [key + 'Any']: undefined}});
  }
  if (value || key?.includes('Any')) {
  return assign({}, state, {filters: {...state.filters, [key]: value}});

diff --git a/web/client/translations/data.de-DE.json b/web/client/translations/data.de-DE.json
@@ -2680,8 +2680,8 @@
  "cacheT": "Cache leeren",
  "save": "Aktuelle Regel speichern",
  "close": "Beenden Sie die Regelerstellung",
- "filterRuleList": "Toon alle in aanmerking komende regels",
- "showAllRules": "Filterlijst met geselecteerde waarde"
+ "showAllRules": "Toon alle in aanmerking komende regels",
+ "filterRuleList": "Filterlijst met geselecteerde waarde"
  },
  "navItems": {
  "main": "Allgemeine Regel",

diff --git a/web/client/translations/data.en-US.json b/web/client/translations/data.en-US.json
@@ -2653,8 +2653,8 @@
  "cacheT": "Clear cache",
  "save": "Save current rule",
  "close": "Exit from create rule",
- "filterRuleList": "Show all eligible rules",
- "showAllRules": "Filter list using selected value"
+ "showAllRules": "Show all eligible rules",
+ "filterRuleList": "Filter list using selected value"
  },
  "navItems": {
  "main": "General Rule",

diff --git a/web/client/translations/data.es-ES.json b/web/client/translations/data.es-ES.json
@@ -2643,8 +2643,8 @@
  "cacheT": "Limpiar cache",
  "save": "Guardar la regla actual",
  "close": "Salir de crear regla",
- "filterRuleList": "Mostrar todas las reglas elegibles",
- "showAllRules": "Lista de filtros usando un valor seleccionado"
+ "showAllRules": "Mostrar todas las reglas elegibles",
+ "filterRuleList": "Lista de filtros usando un valor seleccionado"
  },
  "navItems": {
  "main": "Regla general",

diff --git a/web/client/translations/data.fr-FR.json b/web/client/translations/data.fr-FR.json
@@ -2643,8 +2643,8 @@
  "cacheT": "Vider le cache",
  "save": "Enregistrer la règle actuelle",
  "close": "Fermer la règle",
- "filterRuleList": "Montrer toutes les règles éligibles",
- "showAllRules": "Liste de filtre à l'aide d'une valeur sélectionnée"
+ "showAllRules": "Montrer toutes les règles éligibles",
+ "filterRuleList": "Liste de filtre à l'aide d'une valeur sélectionnée"
  },
  "navItems": {
  "main": "Règle générale",

diff --git a/web/client/translations/data.it-IT.json b/web/client/translations/data.it-IT.json
@@ -2644,8 +2644,8 @@
  "cacheT": "Pulisci la cache",
  "save": "Salva regola corrente",
  "close": "Esci da modifica regola",
- "filterRuleList": "Mostra tutte le regole idonei",
- "showAllRules": "Filter list using selected value"
+ "showAllRules": "Mostra tutte le regole applicabili",
+ "filterRuleList": "Filtra la lista usando il valore selezionato"
  },
  "navItems": {
  "main": "Regola Generica",