geosolutions-it#10488: 'ilike' as default operator for text field in …

…attribute table quick filter [resolve review comments] Description: - replace operator prop with defaultOperator - remove unused prop operator from BaseDateTimeFilter component
mahmoudadel54 · Jul 30, 2024 · 3e51e1a · 3e51e1a
1 parent 61fac34
commit 3e51e1a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/web/client/components/data/featuregrid/filterRenderers/AttributeFilter.jsx b/web/client/components/data/featuregrid/filterRenderers/AttributeFilter.jsx
@@ -23,7 +23,7 @@ class AttributeFilter extends React.PureComponent {
         column: PropTypes.object,
         placeholderMsgId: PropTypes.string,
         tooltipMsgId: PropTypes.string,
-        operator: PropTypes.string,
+        defaultOperator: PropTypes.string,
         type: PropTypes.string,
         isWithinAttrTbl: PropTypes.bool
     };
@@ -38,7 +38,7 @@ class AttributeFilter extends React.PureComponent {
         onChange: () => {},
         column: {},
         placeholderMsgId: "featuregrid.filter.placeholders.default",
-        operator: "=",
+        defaultOperator: "=",
         isWithinAttrTbl: false
     };
     constructor(props) {
@@ -50,7 +50,7 @@ class AttributeFilter extends React.PureComponent {
             booleanOperators: ["="],
             defaultOperators: ["=", ">", "<", ">=", "<=", "<>", "isNull"],
             timeDateOperators: ["=", ">", "<", ">=", "<=", "<>", "><", "isNull"],
-            operator: this.props.isWithinAttrTbl ? (this.props.operator || '=') : "",
+            operator: this.props.isWithinAttrTbl ? (this.props.defaultOperator) : "",
             isInputValid: true
         };
     }

diff --git a/web/client/components/data/featuregrid/filterRenderers/BaseDateTimeFilter.js b/web/client/components/data/featuregrid/filterRenderers/BaseDateTimeFilter.js
@@ -104,7 +104,7 @@ export class DateFilter extends AttributeFilter {
         />);
     }
     handleChange = (value, stringValue) => {
-        this.props.onChange({ value, stringValue, attribute: this.props.column && this.props.column.name, inputOperator: this.state.operator || this.props.operator });
+        this.props.onChange({ value, stringValue, attribute: this.props.column && this.props.column.name, inputOperator: this.state.operator });
     }
     handleChangeRangeFilter = (value, stringValue, order = 'start') => {
         let reqVal = {};
@@ -119,7 +119,7 @@ export class DateFilter extends AttributeFilter {
                 endDate: this.props.value?.endDate
             };
         }
-        this.props.onChange({ value: reqVal, stringValue, attribute: this.props.column && this.props.column.name, inputOperator: this.state.operator || this.props.operator });
+        this.props.onChange({ value: reqVal, stringValue, attribute: this.props.column && this.props.column.name, inputOperator: this.state.operator });
     }
 }
 

diff --git a/web/client/components/data/featuregrid/filterRenderers/StringFilter.jsx b/web/client/components/data/featuregrid/filterRenderers/StringFilter.jsx
@@ -6,7 +6,7 @@ export default compose(
     defaultProps({
         onValueChange: () => {},
         placeholderMsgId: "featuregrid.filter.placeholders.string",
-        operator: 'ilike'
+        defaultOperator: 'ilike'
     }),
     withHandlers({
         onChange: props => ({value, attribute, inputOperator} = {}) => {